cxx-qt-gen: leave use statements in the CXX bridge

Related to #404
KDAB · Jul 21, 2023 · e878d8f · e878d8f
1 parent 4d7effa
commit e878d8f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 44 deletions.
diff --git a/crates/cxx-qt-gen/src/generator/rust/mod.rs b/crates/cxx-qt-gen/src/generator/rust/mod.rs
@@ -37,7 +37,7 @@ impl GeneratedRustBlocks {
         Ok(GeneratedRustBlocks {
             cxx_mod: parser.passthrough_module.clone(),
             cxx_mod_contents: vec![generate_include(parser)?],
-            cxx_qt_mod_contents: parser.cxx_qt_data.uses.clone(),
+            cxx_qt_mod_contents: vec![],
             namespace: parser.cxx_qt_data.namespace.clone(),
             qobjects: parser
                 .cxx_qt_data
@@ -124,29 +124,6 @@ mod tests {
         assert_eq!(rust.qobjects.len(), 1);
     }
 
-    #[test]
-    fn test_generated_rust_blocks_uses() {
-        let module: ItemMod = parse_quote! {
-            #[cxx_qt::bridge(namespace = "cxx_qt")]
-            mod ffi {
-                use std::collections::HashMap;
-
-                extern "RustQt" {
-                    #[cxx_qt::qobject]
-                    type MyObject = super::MyObjectRust;
-                }
-            }
-        };
-        let parser = Parser::from(module).unwrap();
-
-        let rust = GeneratedRustBlocks::from(&parser).unwrap();
-        assert_eq!(rust.cxx_mod.content.unwrap().1.len(), 0);
-        assert_eq!(rust.cxx_mod_contents.len(), 1);
-        assert_eq!(rust.cxx_qt_mod_contents.len(), 1);
-        assert_eq!(rust.namespace, "cxx_qt");
-        assert_eq!(rust.qobjects.len(), 1);
-    }
-
     #[test]
     fn test_generated_rust_blocks_cxx_file_stem() {
         let module: ItemMod = parse_quote! {

diff --git a/crates/cxx-qt-gen/src/parser/cxxqtdata.rs b/crates/cxx-qt-gen/src/parser/cxxqtdata.rs
@@ -62,8 +62,6 @@ pub struct ParsedCxxQtData {
     pub qobjects: BTreeMap<Ident, ParsedQObject>,
     /// The namespace of the CXX-Qt module
     pub namespace: String,
-    /// Any `use` statements end up in the CXX-Qt generated module
-    pub uses: Vec<Item>,
 }
 
 impl ParsedCxxQtData {
@@ -202,11 +200,6 @@ impl ParsedCxxQtData {
     pub fn parse_cxx_qt_item(&mut self, item: Item) -> Result<Option<Item>> {
         match item {
             Item::Impl(imp) => self.parse_impl(imp),
-            Item::Use(_) => {
-                // Any use statements go into the CXX-Qt generated block
-                self.uses.push(item);
-                Ok(None)
-            }
             Item::ForeignMod(foreign_mod) => self.parse_foreign_mod(foreign_mod),
             _ => Ok(Some(item)),
         }
@@ -523,18 +516,6 @@ mod tests {
         assert_eq!(cxx_qt_data.qobjects[&qobject_ident()].others.len(), 1);
     }
 
-    #[test]
-    fn test_find_and_merge_cxx_qt_item_uses() {
-        let mut cxx_qt_data = create_parsed_cxx_qt_data();
-
-        let item: Item = parse_quote! {
-            use std::collections::HashMap;
-        };
-        let result = cxx_qt_data.parse_cxx_qt_item(item).unwrap();
-        assert!(result.is_none());
-        assert_eq!(cxx_qt_data.uses.len(), 1);
-    }
-
     #[test]
     fn test_find_and_merge_cxx_qt_item_passthrough() {
         let mut cxx_qt_data = create_parsed_cxx_qt_data();

diff --git a/crates/cxx-qt-gen/test_outputs/passthrough_and_naming.rs b/crates/cxx-qt-gen/test_outputs/passthrough_and_naming.rs
@@ -41,6 +41,7 @@ pub mod ffi {
         x: A,
         y: B,
     }
+    use super::MyTrait;
     unsafe extern "C++" {
         include ! (< QtCore / QStringListModel >);
     }
@@ -208,7 +209,6 @@ pub mod ffi {
         fn cxx_qt_ffi_rust_mut(self: Pin<&mut SecondObject>) -> Pin<&mut SecondObjectRust>;
     }
 }
-use super::MyTrait;
 impl ffi::MyObject {
     #[doc = "Getter for the Q_PROPERTY "]
     #[doc = "property_name"]