Merge branch 'main' of github.com:google/autocxx into newtest3

Author: adetaylor

Cargo.lock

@@ -11,7 +11,8 @@ fn main() {
     let path = std::path::PathBuf::from("src"); // include path
     let mut b = autocxx_build::Builder::new("src/main.rs", &[&path])
         .extra_clang_args(&["-std=c++17"])
-        .expect_build();
+        .build()
+        .unwrap();
     b.flag_if_supported("-std=c++17") // use "-std:c++17" here if using msvc on windows
         .compile("autocxx-demo"); // arbitrary library name, pick anything
     println!("cargo:rerun-if-changed=src/main.rs");

book/src/building.md

@@ -33,13 +33,16 @@ Now, add a `build.rs` next to your `Cargo.toml` (this is a standard `cargo` [bui
 
 ```rust,ignore
 fn main() -> miette::Result<()> {
-    let path = std::path::PathBuf::from("src"); // include path
-    let mut b = autocxx_build::Builder::new("src/main.rs", &[&path]).build()?;
-        // This assumes all your C++ bindings are in main.rs
+    let include_path = std::path::PathBuf::from("src");
+
+    // This assumes all your C++ bindings are in main.rs
+    let mut b = autocxx_build::Builder::new("src/main.rs", &[&include_path]).build()?;
     b.flag_if_supported("-std=c++14")
      .compile("autocxx-demo"); // arbitrary library name, pick anything
     println!("cargo:rerun-if-changed=src/main.rs");
+
     // Add instructions to link to any C++ libraries you need.
+
     Ok(())
 }
 ```

book/src/tutorial.md

@@ -30,8 +30,8 @@ log = "0.4"
 proc-macro2 = "1.0.11"
 quote = "1.0"
 indoc = "1.0"
-autocxx-bindgen = { version = "=0.70.1", default-features = false, features = ["logging", "which-rustfmt"] }
-#autocxx-bindgen = { git = "https://github.com/adetaylor/rust-bindgen", branch = "merge-0.70.1", default-features = false, features = ["logging", "which-rustfmt"] }
+autocxx-bindgen = { version = "=0.71.1", default-features = false, features = ["logging", "which-rustfmt"] }
+#autocxx-bindgen = { git = "https://github.com/adetaylor/rust-bindgen", branch = "merge-latest-upstream", default-features = false, features = ["logging", "which-rustfmt"] }
 itertools = "0.10.3"
 cc = { version = "1.0", optional = true }
 # Note: Keep the patch-level version of cxx-gen and cxx in sync.

engine/Cargo.toml

@@ -372,7 +372,10 @@ impl<'a> TypeConverter<'a> {
                 }
                 let (new_tn, api) = self.get_templated_typename(&Type::Path(typ))?;
                 extra_apis.extend(api.into_iter());
-                deps.remove(&tn);
+                // Although it's tempting to remove the dep on the original type,
+                // this means we wouldn't spot cases where the original type can't
+                // be represented in C++, e.g. because it has an unused template parameter.
+                // So we keep the original dep too.
                 typ = new_tn.to_type_path();
                 deps.insert(new_tn);
             }

engine/src/conversion/analysis/type_converter.rs

@@ -120,7 +120,7 @@ impl<'a> BridgeConverter<'a> {
                 Self::dump_apis("parsing", &apis);
                 // Inside parse_results, we now have a list of APIs.
                 // We now enter various analysis phases.
-                // Next, convert any typedefs.
+                // First, convert any typedefs.
                 // "Convert" means replacing bindgen-style type targets
                 // (e.g. root::std::unique_ptr) with cxx-style targets (e.g. UniquePtr).
                 let apis = convert_typedef_targets(self.config, apis);

engine/src/conversion/mod.rs

@@ -20,7 +20,10 @@ categories = ["development-tools::ffi", "api-bindings"]
 
 [dependencies]
 proc-macro2 = "1.0.11"
-trybuild = "1.0.53"
+# More recent versions of trybuild don't work due to
+# https://github.com/dtolnay/trybuild/issues/283
+# There are some workarounds suggested there if needs be.
+trybuild = "=1.0.81"
 test-log = "0.2.2"
 env_logger = "0.9.0"
 rust_info = "0.3.1"

integration-tests/Cargo.toml

@@ -12429,6 +12429,33 @@ fn test_override_typedef_fn() {
     run_test("", hdr, quote! {}, &["Foo"], &[]);
 }
 
+#[test]
+fn test_double_template_w_default() {
+    let hdr = indoc! {"
+        class Widget {};
+
+        template <class T>
+        class RefPtr {
+        private:
+            T* m_ptr;
+        };
+
+        class FakeAlloc {};
+
+        template <typename T, typename A=FakeAlloc>
+        class Holder {
+            A alloc;
+        };
+
+        typedef Holder<RefPtr<Widget>> WidgetRefHolder;
+        class Problem {
+        public:
+            WidgetRefHolder& getWidgets();
+        };
+    "};
+    run_test("", hdr, quote! {}, &["Problem"], &[]);
+}
+
 // Yet to test:
 // - Ifdef
 // - Out param pointers