Separate parsing RustQt blocks, like we do with C++Qt

- Refactor parsing steps to be more readable
- Refactor tests to be better separated

Author: BenFordTytherington

crates/cxx-qt-build/src/lib.rs

@@ -43,8 +43,8 @@ use std::{
 };
 
 use cxx_qt_gen::{
-    parse_qt_file, qualify_self_types, write_cpp, write_rust, CppFragment, CxxQtItem,
-    GeneratedCppBlocks, GeneratedOpt, GeneratedRustBlocks, Parser,
+    parse_qt_file, self_inlining::qualify_self_types, write_cpp, write_rust, CppFragment,
+    CxxQtItem, GeneratedCppBlocks, GeneratedOpt, GeneratedRustBlocks, Parser,
 };
 
 // TODO: we need to eventually support having multiple modules defined in a single file. This

crates/cxx-qt-gen/src/generator/rust/mod.rs

@@ -104,6 +104,7 @@ impl GeneratedRustBlocks {
 fn add_qobject_import(cxx_qt_data: &ParsedCxxQtData) -> Option<GeneratedRustFragment> {
     let includes = cxx_qt_data
         .qobjects()
+        .iter()
         .any(|obj| obj.has_qobject_macro && obj.base_class.is_none());
     if includes
         || cxx_qt_data

crates/cxx-qt-gen/src/generator/structuring/mod.rs

@@ -80,6 +80,7 @@ impl<'a> Structures<'a> {
     pub fn new(cxxqtdata: &'a ParsedCxxQtData) -> Result<Self> {
         let mut qobjects: Vec<_> = cxxqtdata
             .qobjects()
+            .into_iter()
             .map(StructuredQObject::from_qobject)
             .collect();
 

crates/cxx-qt-gen/src/lib.rs

@@ -11,7 +11,7 @@
 mod generator;
 mod naming;
 mod parser;
-mod preprocessor;
+mod shorthand;
 mod syntax;
 mod writer;
 
@@ -21,7 +21,7 @@ pub use generator::{
     GeneratedOpt,
 };
 pub use parser::Parser;
-pub use preprocessor::self_inlining::qualify_self_types;
+pub use shorthand::self_inlining;
 pub use syntax::{parse_qt_file, CxxQtFile, CxxQtItem};
 pub use writer::{cpp::write_cpp, rust::write_rust};
 
@@ -88,6 +88,7 @@ mod tests {
             $(assert!($parse_fn(syn::parse_quote! $input).is_err());)*
         }
     }
+    use crate::self_inlining::qualify_self_types;
     pub(crate) use assert_parse_errors;
 
     /// Helper for formating C++ code