From f2217180911948fbcb2a41bc6b9f22552a5ce2c0 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 21 Dec 2020 16:47:26 -0800 Subject: [PATCH] Add some use of enum variant rename in tests --- tests/ffi/lib.rs | 7 +++++-- tests/ffi/tests.h | 4 ++-- tests/test.rs | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/ffi/lib.rs b/tests/ffi/lib.rs index 2c065d92..7504704b 100644 --- a/tests/ffi/lib.rs +++ b/tests/ffi/lib.rs @@ -30,7 +30,8 @@ pub mod ffi { enum Enum { AVal, BVal = 2020, - CVal, + #[cxx_name = "CVal"] + LastVal, } #[namespace = "A"] @@ -197,7 +198,9 @@ pub mod ffi { #[repr(u32)] #[derive(Hash)] enum COwnedEnum { + #[cxx_name = "CVAL1"] CVal1, + #[cxx_name = "CVAL2"] CVal2, } @@ -473,7 +476,7 @@ fn r_return_enum(n: u32) -> ffi::Enum { } else if n <= 2020 { ffi::Enum::BVal } else { - ffi::Enum::CVal + ffi::Enum::LastVal } } diff --git a/tests/ffi/tests.h b/tests/ffi/tests.h index fba176ce..51ab51df 100644 --- a/tests/ffi/tests.h +++ b/tests/ffi/tests.h @@ -73,8 +73,8 @@ struct E { }; enum COwnedEnum { - CVal1, - CVal2, + CVAL1, + CVAL2, }; size_t c_return_primitive(); diff --git a/tests/test.rs b/tests/test.rs index c825e24e..60bf1bdb 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -76,7 +76,7 @@ fn test_c_return() { _ => assert!(false), } match ffi::c_return_enum(2021) { - enm @ ffi::Enum::CVal => assert_eq!(2021, enm.repr), + enm @ ffi::Enum::LastVal => assert_eq!(2021, enm.repr), _ => assert!(false), } match ffi::c_return_ns_enum(0) { @@ -236,7 +236,7 @@ fn test_c_ns_method_calls() { fn test_enum_representations() { assert_eq!(0, ffi::Enum::AVal.repr); assert_eq!(2020, ffi::Enum::BVal.repr); - assert_eq!(2021, ffi::Enum::CVal.repr); + assert_eq!(2021, ffi::Enum::LastVal.repr); } #[test]