From 4e950ee1289db1b4a4559f9ef0c3b4405b24e221 Mon Sep 17 00:00:00 2001 From: Andrew Hayzen Date: Wed, 4 Sep 2024 16:40:19 +0100 Subject: [PATCH] cxx-qt-gen: fix failing tests --- crates/cxx-qt-gen/src/generator/rust/mod.rs | 14 ++------------ crates/cxx-qt-gen/src/writer/rust/mod.rs | 16 ++++++---------- crates/cxx-qt-gen/test_outputs/inheritance.rs | 2 ++ crates/cxx-qt-gen/test_outputs/invokables.rs | 2 ++ .../test_outputs/passthrough_and_naming.rs | 2 ++ crates/cxx-qt-gen/test_outputs/properties.rs | 2 ++ crates/cxx-qt-gen/test_outputs/qenum.rs | 2 ++ crates/cxx-qt-gen/test_outputs/signals.rs | 2 ++ crates/qt-build-utils/src/lib.rs | 6 +----- 9 files changed, 21 insertions(+), 27 deletions(-) diff --git a/crates/cxx-qt-gen/src/generator/rust/mod.rs b/crates/cxx-qt-gen/src/generator/rust/mod.rs index 00becdb10..b48bc6ac8 100644 --- a/crates/cxx-qt-gen/src/generator/rust/mod.rs +++ b/crates/cxx-qt-gen/src/generator/rust/mod.rs @@ -110,8 +110,6 @@ mod tests { use super::*; - use crate::tests::assert_tokens_eq; - #[test] fn test_generated_rust_blocks() { let module: ItemMod = parse_quote! { @@ -127,15 +125,7 @@ mod tests { let rust = GeneratedRustBlocks::from(&parser).unwrap(); assert!(rust.cxx_mod.content.is_none()); - assert_eq!(rust.cxx_mod_contents.len(), 1); - assert_tokens_eq( - &rust.cxx_mod_contents[0], - quote! { - unsafe extern "C++" { - include!("cxx-qt-gen/ffi.cxxqt.h"); - } - }, - ); + assert_eq!(rust.cxx_mod_contents.len(), 0); assert_eq!(rust.namespace, ""); assert_eq!(rust.fragments.len(), 1); } @@ -155,7 +145,7 @@ mod tests { let rust = GeneratedRustBlocks::from(&parser).unwrap(); assert!(rust.cxx_mod.content.is_none()); - assert_eq!(rust.cxx_mod_contents.len(), 1); + assert_eq!(rust.cxx_mod_contents.len(), 0); assert_eq!(rust.namespace, "cxx_qt"); assert_eq!(rust.fragments.len(), 1); } diff --git a/crates/cxx-qt-gen/src/writer/rust/mod.rs b/crates/cxx-qt-gen/src/writer/rust/mod.rs index a0fd2fe27..990980357 100644 --- a/crates/cxx-qt-gen/src/writer/rust/mod.rs +++ b/crates/cxx-qt-gen/src/writer/rust/mod.rs @@ -102,11 +102,7 @@ mod tests { cxx_mod: parse_quote! { mod ffi {} }, - cxx_mod_contents: vec![parse_quote! { - unsafe extern "C++" { - include!("myobject.cxxqt.h"); - } - }], + cxx_mod_contents: vec![], namespace: "cxx_qt::my_object".to_owned(), fragments: vec![GeneratedRustFragment { cxx_mod_contents: vec![ @@ -144,11 +140,7 @@ mod tests { cxx_mod: parse_quote! { mod ffi {} }, - cxx_mod_contents: vec![parse_quote! { - unsafe extern "C++" { - include!("multiobject.cxxqt.h"); - } - }], + cxx_mod_contents: vec![], namespace: "cxx_qt".to_owned(), fragments: vec![ GeneratedRustFragment { @@ -221,11 +213,13 @@ mod tests { #[doc(hidden)] #[namespace = "Qt"] #[rust_name = "CxxQtConnectionType"] + #[allow(dead_code)] type ConnectionType = cxx_qt::ConnectionType; #[doc(hidden)] #[namespace = "rust::cxxqt1"] #[rust_name = "CxxQtQMetaObjectConnection"] + #[allow(dead_code)] type QMetaObjectConnection = cxx_qt::QMetaObjectConnection; } @@ -267,11 +261,13 @@ mod tests { #[doc(hidden)] #[namespace = "Qt"] #[rust_name = "CxxQtConnectionType"] + #[allow(dead_code)] type ConnectionType = cxx_qt::ConnectionType; #[doc(hidden)] #[namespace = "rust::cxxqt1"] #[rust_name = "CxxQtQMetaObjectConnection"] + #[allow(dead_code)] type QMetaObjectConnection = cxx_qt::QMetaObjectConnection; } diff --git a/crates/cxx-qt-gen/test_outputs/inheritance.rs b/crates/cxx-qt-gen/test_outputs/inheritance.rs index de872db39..9900b473b 100644 --- a/crates/cxx-qt-gen/test_outputs/inheritance.rs +++ b/crates/cxx-qt-gen/test_outputs/inheritance.rs @@ -12,10 +12,12 @@ mod inheritance { #[doc(hidden)] #[namespace = "Qt"] #[rust_name = "CxxQtConnectionType"] + #[allow(dead_code)] type ConnectionType = cxx_qt::ConnectionType; #[doc(hidden)] #[namespace = "rust::cxxqt1"] #[rust_name = "CxxQtQMetaObjectConnection"] + #[allow(dead_code)] type QMetaObjectConnection = cxx_qt::QMetaObjectConnection; } unsafe extern "C++" { diff --git a/crates/cxx-qt-gen/test_outputs/invokables.rs b/crates/cxx-qt-gen/test_outputs/invokables.rs index 35afb00d4..24f2d1334 100644 --- a/crates/cxx-qt-gen/test_outputs/invokables.rs +++ b/crates/cxx-qt-gen/test_outputs/invokables.rs @@ -18,10 +18,12 @@ mod ffi { #[doc(hidden)] #[namespace = "Qt"] #[rust_name = "CxxQtConnectionType"] + #[allow(dead_code)] type ConnectionType = cxx_qt::ConnectionType; #[doc(hidden)] #[namespace = "rust::cxxqt1"] #[rust_name = "CxxQtQMetaObjectConnection"] + #[allow(dead_code)] type QMetaObjectConnection = cxx_qt::QMetaObjectConnection; } unsafe extern "C++" { diff --git a/crates/cxx-qt-gen/test_outputs/passthrough_and_naming.rs b/crates/cxx-qt-gen/test_outputs/passthrough_and_naming.rs index dfdd518c5..ed4042ddf 100644 --- a/crates/cxx-qt-gen/test_outputs/passthrough_and_naming.rs +++ b/crates/cxx-qt-gen/test_outputs/passthrough_and_naming.rs @@ -60,10 +60,12 @@ pub mod ffi { #[doc(hidden)] #[namespace = "Qt"] #[rust_name = "CxxQtConnectionType"] + #[allow(dead_code)] type ConnectionType = cxx_qt::ConnectionType; #[doc(hidden)] #[namespace = "rust::cxxqt1"] #[rust_name = "CxxQtQMetaObjectConnection"] + #[allow(dead_code)] type QMetaObjectConnection = cxx_qt::QMetaObjectConnection; } unsafe extern "C++" { diff --git a/crates/cxx-qt-gen/test_outputs/properties.rs b/crates/cxx-qt-gen/test_outputs/properties.rs index 896198109..86a8f2293 100644 --- a/crates/cxx-qt-gen/test_outputs/properties.rs +++ b/crates/cxx-qt-gen/test_outputs/properties.rs @@ -11,10 +11,12 @@ mod ffi { #[doc(hidden)] #[namespace = "Qt"] #[rust_name = "CxxQtConnectionType"] + #[allow(dead_code)] type ConnectionType = cxx_qt::ConnectionType; #[doc(hidden)] #[namespace = "rust::cxxqt1"] #[rust_name = "CxxQtQMetaObjectConnection"] + #[allow(dead_code)] type QMetaObjectConnection = cxx_qt::QMetaObjectConnection; } unsafe extern "C++" { diff --git a/crates/cxx-qt-gen/test_outputs/qenum.rs b/crates/cxx-qt-gen/test_outputs/qenum.rs index 0bd8db628..67f18c504 100644 --- a/crates/cxx-qt-gen/test_outputs/qenum.rs +++ b/crates/cxx-qt-gen/test_outputs/qenum.rs @@ -6,10 +6,12 @@ mod ffi { #[doc(hidden)] #[namespace = "Qt"] #[rust_name = "CxxQtConnectionType"] + #[allow(dead_code)] type ConnectionType = cxx_qt::ConnectionType; #[doc(hidden)] #[namespace = "rust::cxxqt1"] #[rust_name = "CxxQtQMetaObjectConnection"] + #[allow(dead_code)] type QMetaObjectConnection = cxx_qt::QMetaObjectConnection; } unsafe extern "C++" { diff --git a/crates/cxx-qt-gen/test_outputs/signals.rs b/crates/cxx-qt-gen/test_outputs/signals.rs index e43a8ac41..257105512 100644 --- a/crates/cxx-qt-gen/test_outputs/signals.rs +++ b/crates/cxx-qt-gen/test_outputs/signals.rs @@ -12,10 +12,12 @@ mod ffi { #[doc(hidden)] #[namespace = "Qt"] #[rust_name = "CxxQtConnectionType"] + #[allow(dead_code)] type ConnectionType = cxx_qt::ConnectionType; #[doc(hidden)] #[namespace = "rust::cxxqt1"] #[rust_name = "CxxQtQMetaObjectConnection"] + #[allow(dead_code)] type QMetaObjectConnection = cxx_qt::QMetaObjectConnection; } unsafe extern "C++" { diff --git a/crates/qt-build-utils/src/lib.rs b/crates/qt-build-utils/src/lib.rs index 511fe0f4a..f7f424abe 100644 --- a/crates/qt-build-utils/src/lib.rs +++ b/crates/qt-build-utils/src/lib.rs @@ -984,11 +984,7 @@ Q_IMPORT_PLUGIN({plugin_class_name}); std::fs::create_dir_all(&output_folder).expect("Could not create qrc dir"); let output_path = output_folder.join(format!( "{}.cpp", - input_path - .file_name() - .unwrap() - .to_string_lossy() - .to_string(), + input_path.file_name().unwrap().to_string_lossy(), )); let cmd = Command::new(self.rcc_executable.as_ref().unwrap())