commit a577d824792c28b67c3ed2279bbaa299e11975b3
author Lukasz Anforowicz <lukasza@google.com> Mon Dec 12 15:00:46 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Dec 12 15:01:24 2022 -0800
tree 0bd135eb79d0defa967563345a07d6cce9b69845
parent 5bf4943d7f5b58c116ccef74cf4705f0821237ec

Support translating Rust modules into C++ namespaces.

PiperOrigin-RevId: 494838620

cc_bindings_from_rs/cc_bindings_from_rs.rs

diff --git a/cc_bindings_from_rs/cc_bindings_from_rs.rs b/cc_bindings_from_rs/cc_bindings_from_rs.rs
index e58f2aa..31d2ab0 100644
--- a/cc_bindings_from_rs/cc_bindings_from_rs.rs
+++ b/cc_bindings_from_rs/cc_bindings_from_rs.rs
@@ -313,11 +313,13 @@
             let rs_input_path = self.tempdir.path().join("test_crate.rs");
             std::fs::write(
                 &rs_input_path,
-                r#" pub fn public_function() {
-                        private_function()
-                    }
+                r#" pub mod public_module {
+                        pub fn public_function() {
+                            private_function()
+                        }
 
-                    fn private_function() {}
+                        fn private_function() {}
+                    }
                 "#,
             )?;
 
@@ -380,7 +382,7 @@
             let mut marked_pattern = expected.to_string();
             marked_pattern.insert_str(longest_matching_expectation_len, "!!!>>>");
             panic!(
-                "h_body didn't match expectations:\n\
+                "Mismatched expectations:\n\
                     #### Actual body (first mismatch follows the \"!!!>>>\" marker):\n\
                     {marked_body}\n\
                     #### Mismatched pattern (mismatch follows the \"!!!>>>\" marker):\n\
@@ -404,6 +406,12 @@
 #pragma once
 
 namespace test_crate {
+
+// Error generating bindings for `public_module` defined at
+// /tmp/.ANY_IDENTIFIER_CHARACTERS/test_crate.rs:1:2: 1:23: Unsupported
+// rustc_hir::hir::ItemKind: module
+
+namespace public_module {
 namespace __crubit_internal {
 extern "C" void
 __crubit_thunk__ANY_IDENTIFIER_CHARACTERS();
@@ -412,6 +420,7 @@
   return __crubit_internal::
       __crubit_thunk__ANY_IDENTIFIER_CHARACTERS();
 }
+}  // namespace public_module
 }  // namespace test_crate"#,
         );
 
@@ -425,8 +434,9 @@
 #![allow(improper_ctypes_definitions)]
 
 #[no_mangle]
-extern "C" fn __crubit_thunk__ANY_IDENTIFIER_CHARACTERS() -> () {
-    ::test_crate::public_function()
+extern "C" fn __crubit_thunk__ANY_IDENTIFIER_CHARACTERS()
+-> () {
+    ::test_crate::public_module::public_function()
 }
 "#,
         );