commit d886a2b8b74568e6042b9e6f3eea178d02546508
author Dmitri Gribenko <dmitrig@google.com> Tue Jul 02 10:18:41 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jul 02 10:19:44 2024 -0700
tree 2bfcb76dd0962af0e32c504545a7ccf7bcd22019
parent af0c8434c092f2efe6695615e99038b72540e390

Instead of disabling the `dead_code` lint, make the code non-dead

PiperOrigin-RevId: 648760215
Change-Id: Ifd541158fb71e1f1d777afc85c44b0a0dd445410

cc_bindings_from_rs/bindings.rs

diff --git a/cc_bindings_from_rs/bindings.rs b/cc_bindings_from_rs/bindings.rs
index 254d52d..ca90152 100644
--- a/cc_bindings_from_rs/bindings.rs
+++ b/cc_bindings_from_rs/bindings.rs
@@ -5167,10 +5167,12 @@
             assert_rs_matches!(
                 result.rs_details,
                 quote! {
+                    ...
                     #[no_mangle]
                     extern "C" fn ...(__self: &mut ::core::mem::MaybeUninit<::rust_out::SomeStruct>) -> f32 {
                         ::rust_out::SomeStruct::into_f32(unsafe { __self.assume_init_read() })
                     }
+                    ...
                 },
             );
         });
@@ -5179,7 +5181,7 @@
     #[test]
     fn test_format_item_method_taking_self_by_value_implicit_type() {
         let test_src = r#"
-                pub struct SomeStruct(f32);
+                pub struct SomeStruct(pub f32);
 
                 impl SomeStruct {
                     pub fn into_f32(self) -> f32 {
@@ -5197,7 +5199,7 @@
     #[test]
     fn test_format_item_method_taking_self_by_value_explicit_type() {
         let test_src = r#"
-                pub struct SomeStruct(f32);
+                pub struct SomeStruct(pub f32);
 
                 impl SomeStruct {
                     pub fn into_f32(self: SomeStruct) -> f32 {
@@ -5245,6 +5247,7 @@
                     extern "C" fn ...<'__anon1>(__self: &'__anon1 ::rust_out::SomeStruct) -> f32 {
                         ::rust_out::SomeStruct::get_f32(__self)
                     }
+                    ...
                 },
             );
         });
@@ -5253,7 +5256,7 @@
     #[test]
     fn test_format_item_method_taking_self_by_const_ref_implicit_type() {
         let test_src = r#"
-                pub struct SomeStruct(f32);
+                pub struct SomeStruct(pub f32);
 
                 impl SomeStruct {
                     pub fn get_f32(&self) -> f32 {
@@ -5267,7 +5270,7 @@
     #[test]
     fn test_format_item_method_taking_self_by_const_ref_explicit_type() {
         let test_src = r#"
-                pub struct SomeStruct(f32);
+                pub struct SomeStruct(pub f32);
 
                 impl SomeStruct {
                     pub fn get_f32(self: &SomeStruct) -> f32 {
@@ -5319,6 +5322,7 @@
                     ) -> () {
                         ::rust_out::SomeStruct::set_f32(__self, new_value)
                     }
+                    ...
                 },
             );
         });
@@ -5327,7 +5331,7 @@
     #[test]
     fn test_format_item_method_taking_self_by_mutable_ref_implicit_type() {
         let test_src = r#"
-                pub struct SomeStruct(f32);
+                pub struct SomeStruct(pub f32);
 
                 impl SomeStruct {
                     pub fn set_f32(&mut self, new_value: f32) {
@@ -5341,7 +5345,7 @@
     #[test]
     fn test_format_item_method_taking_self_by_mutable_ref_explicit_type() {
         let test_src = r#"
-                pub struct SomeStruct(f32);
+                pub struct SomeStruct(pub f32);
 
                 impl SomeStruct {
                     pub fn set_f32(self: &mut SomeStruct, new_value: f32) {
@@ -5357,7 +5361,7 @@
         let test_src = r#"
                 use std::sync::Arc;
 
-                pub struct SomeStruct(f32);
+                pub struct SomeStruct(pub f32);
 
                 impl SomeStruct {
                     pub fn get_f32(self: Arc<Self>) -> f32 {
@@ -6318,6 +6322,7 @@
     #[test]
     fn test_format_item_struct_with_dynamically_sized_field() {
         let test_src = r#"
+                #![allow(dead_code)]
                 pub struct DynamicallySizedStruct {
                     /// Having a non-ZST field avoids hitting the following error:
                     /// "Zero-sized types (ZSTs) are not supported (b/258259459)"

cc_bindings_from_rs/run_compiler_test_support.rs

diff --git a/cc_bindings_from_rs/run_compiler_test_support.rs b/cc_bindings_from_rs/run_compiler_test_support.rs
index dce5f3b..e61dfeb 100644
--- a/cc_bindings_from_rs/run_compiler_test_support.rs
+++ b/cc_bindings_from_rs/run_compiler_test_support.rs
@@ -71,7 +71,6 @@
         lint_opts: vec![
             ("warnings".to_string(), rustc_lint_defs::Level::Deny),
             ("stable_features".to_string(), rustc_lint_defs::Level::Allow),
-            ("dead_code".to_string(), rustc_lint_defs::Level::Allow),
         ],
         cg: CodegenOptions {
             // As pointed out in `panics_and_exceptions.md` the tool only supports `-C