Merge branch 'main' of github.com:google/autocxx into test-for-1214

google · Jan 31, 2023 · a6ffcc1 · a6ffcc1
2 parents 788816f + a3ab76c
commit a6ffcc1
Show file tree

Hide file tree

Showing 23 changed files with 60 additions and 63 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@
 
 [package]
 name = "autocxx"
-version = "0.23.1"
+version = "0.24.0"
 authors = ["Adrian Taylor <adetaylor@chromium.org>"]
 license = "MIT OR Apache-2.0"
 description = "Safe autogenerated interop between Rust and C++"
@@ -25,7 +25,7 @@ exclude = [ ".github", "book", "tools" ]
 resolver = "2"
 
 [dependencies]
-autocxx-macro = { path="macro", version="0.23.1" }
+autocxx-macro = { path="macro", version="0.24.0" }
 cxx = "1.0.78" # ... also needed because expansion of type_id refers to ::cxx
 aquamarine = "0.1" # docs
 moveit = { version = "0.5", features = [ "cxx" ] }

diff --git a/book/src/tutorial.md b/book/src/tutorial.md
@@ -21,11 +21,11 @@ First, add `autocxx` *and `cxx`* to your `dependencies` and `autocxx-build` to y
 
 ```toml
 [dependencies]
-autocxx = "0.23.1"
+autocxx = "0.24.0"
 cxx = "1.0"
 
 [build-dependencies]
-autocxx-build = "0.23.1"
+autocxx-build = "0.24.0"
 miette = { version = "5", features = ["fancy"] } # optional but gives nicer error messages!
 ```
 

diff --git a/demo/Cargo.toml b/demo/Cargo.toml
@@ -8,14 +8,14 @@
 
 [package]
 name = "autocxx-demo"
-version = "0.23.1"
+version = "0.24.0"
 authors = ["Adrian Taylor <adetaylor@chromium.org>"]
 edition = "2021"
 
 [dependencies]
 cxx = "1.0.78"
-autocxx = { path = "..", version = "0.23.1" }
+autocxx = { path = "..", version = "0.24.0" }
 
 [build-dependencies]
-autocxx-build = { path = "../gen/build", version = "0.23.1" }
+autocxx-build = { path = "../gen/build", version = "0.24.0" }
 miette = { version = "5", features = ["fancy"] }
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
@@ -8,7 +8,7 @@
 
 [package]
 name = "autocxx-engine"
-version = "0.23.1"
+version = "0.24.0"
 authors = ["Adrian Taylor <adetaylor@chromium.org>"]
 license = "MIT OR Apache-2.0"
 description = "Safe autogenerated interop between Rust and C++"
@@ -38,7 +38,7 @@ cc = { version = "1.0", optional = true }
 # There can be interdependencies between the code generated by cxx-gen and
 # what cxx expects to be there.
 cxx-gen = "0.7.78"
-autocxx-parser = { version = "=0.23.1", path = "../parser" }
+autocxx-parser = { version = "=0.24.0", path = "../parser" }
 version_check = "0.9"
 aquamarine = "0.1"                                             # docs
 tempfile = "3.1"

diff --git a/engine/src/conversion/api.rs b/engine/src/conversion/api.rs
@@ -731,20 +731,17 @@ impl<T: AnalysisPhase> Api<T> {
     /// just use `Debug` here, but some of the `syn` types make that awkward.
     pub(crate) fn details_display(&self) -> String {
         match self {
-            Api::ForwardDeclaration { err, .. } => format!("{:?}", err),
+            Api::ForwardDeclaration { err, .. } => format!("{err:?}"),
             Api::OpaqueTypedef {
                 forward_declaration,
                 ..
-            } => format!("forward_declaration={:?}", forward_declaration),
+            } => format!("forward_declaration={forward_declaration:?}"),
             Api::ConcreteType {
                 rs_definition,
                 cpp_definition,
                 ..
-            } => format!(
-                "rs_definition={:?}, cpp_definition={}",
-                rs_definition, cpp_definition
-            ),
-            Api::ExternCppType { pod, .. } => format!("pod={}", pod),
+            } => format!("rs_definition={rs_definition:?}, cpp_definition={cpp_definition}"),
+            Api::ExternCppType { pod, .. } => format!("pod={pod}"),
             _ => String::new(),
         }
     }

diff --git a/examples/chromium-fake-render-frame-host/Cargo.toml b/examples/chromium-fake-render-frame-host/Cargo.toml
@@ -14,8 +14,8 @@ edition = "2021"
 
 [dependencies]
 cxx = "1.0.78"
-autocxx = { path = "../..", version = "0.23.1" }
+autocxx = { path = "../..", version = "0.24.0" }
 
 [build-dependencies]
-autocxx-build = { path = "../../gen/build", version = "0.23.1" }
+autocxx-build = { path = "../../gen/build", version = "0.24.0" }
 miette = { version = "5", features = ["fancy"] }
diff --git a/examples/cpp_calling_rust/Cargo.toml b/examples/cpp_calling_rust/Cargo.toml
@@ -15,12 +15,12 @@ edition = "2021"
 
 [dependencies]
 cxx = "1.0.78"
-autocxx = { path = "../..", version="0.23.1" }
+autocxx = { path = "../..", version="0.24.0" }
 uwuify = "0.2.2"
 textwrap = "0.14"
 fastrand = "1.5.0"
 
 [build-dependencies]
-autocxx-build = { path = "../../gen/build", version="0.23.1" }
+autocxx-build = { path = "../../gen/build", version="0.24.0" }
 regex = "1.5.4"
 miette = { version="5", features = [ "fancy" ] }
diff --git a/examples/llvm/Cargo.toml b/examples/llvm/Cargo.toml
@@ -14,8 +14,8 @@ edition = "2021"
 
 [dependencies]
 cxx = "1.0.78"
-autocxx = { path = "../..", version = "0.23.1" }
+autocxx = { path = "../..", version = "0.24.0" }
 
 [build-dependencies]
-autocxx-build = { path = "../../gen/build", version = "0.23.1" }
+autocxx-build = { path = "../../gen/build", version = "0.24.0" }
 miette = { version = "5", features = ["fancy"] }
diff --git a/examples/non-trivial-type-on-stack/Cargo.toml b/examples/non-trivial-type-on-stack/Cargo.toml
@@ -14,8 +14,8 @@ edition = "2021"
 
 [dependencies]
 cxx = "1.0.78"
-autocxx = { path = "../..", version = "0.23.1" }
+autocxx = { path = "../..", version = "0.24.0" }
 
 [build-dependencies]
-autocxx-build = { path = "../../gen/build", version = "0.23.1" }
+autocxx-build = { path = "../../gen/build", version = "0.24.0" }
 miette = { version = "5", features = ["fancy"] }
diff --git a/examples/pod/Cargo.toml b/examples/pod/Cargo.toml
@@ -14,8 +14,8 @@ edition = "2021"
 
 [dependencies]
 cxx = "1.0.78"
-autocxx = { path = "../..", version = "0.23.1" }
+autocxx = { path = "../..", version = "0.24.0" }
 
 [build-dependencies]
-autocxx-build = { path = "../../gen/build", version = "0.23.1" }
+autocxx-build = { path = "../../gen/build", version = "0.24.0" }
 miette = { version = "5", features = ["fancy"] }
diff --git a/examples/reference-wrappers/Cargo.toml b/examples/reference-wrappers/Cargo.toml
@@ -14,8 +14,8 @@ edition = "2021"
 
 [dependencies]
 cxx = "1.0.78"
-autocxx = { path = "../..", version = "0.23.1" }
+autocxx = { path = "../..", version = "0.24.0" }
 
 [build-dependencies]
-autocxx-build = { path = "../../gen/build", version = "0.23.1" }
+autocxx-build = { path = "../../gen/build", version = "0.24.0" }
 miette = { version = "5", features = ["fancy"] }
diff --git a/examples/s2/Cargo.toml b/examples/s2/Cargo.toml
@@ -16,8 +16,8 @@ edition = "2021"
 
 [dependencies]
 cxx = "1.0.78"
-autocxx = { path = "../..", version = "0.23.1" }
+autocxx = { path = "../..", version = "0.24.0" }
 
 [build-dependencies]
-autocxx-build = { path = "../../gen/build", version = "0.23.1" }
+autocxx-build = { path = "../../gen/build", version = "0.24.0" }
 miette = { version = "5", features = ["fancy"] }
diff --git a/examples/steam-mini/Cargo.toml b/examples/steam-mini/Cargo.toml
@@ -16,8 +16,8 @@ edition = "2021"
 
 [dependencies]
 cxx = "1.0.78"
-autocxx = { path = "../..", version = "0.23.1" }
+autocxx = { path = "../..", version = "0.24.0" }
 
 [build-dependencies]
-autocxx-build = { path = "../../gen/build", version = "0.23.1" }
+autocxx-build = { path = "../../gen/build", version = "0.24.0" }
 miette = { version = "5", features = ["fancy"] }
diff --git a/examples/subclass/Cargo.toml b/examples/subclass/Cargo.toml
@@ -16,12 +16,12 @@ edition = "2021"
 
 [dependencies]
 cxx = "1.0.78"
-autocxx = { path = "../..", version = "0.23.1" }
+autocxx = { path = "../..", version = "0.24.0" }
 uwuify = "0.2.2"
 textwrap = "0.15"
 fastrand = "1.5.0"
 
 [build-dependencies]
-autocxx-build = { path = "../../gen/build", version = "0.23.1" }
+autocxx-build = { path = "../../gen/build", version = "0.24.0" }
 regex = "1.5.4"
 miette = { version = "5", features = ["fancy"] }
diff --git a/gen/build/Cargo.toml b/gen/build/Cargo.toml
@@ -8,7 +8,7 @@
 
 [package]
 name = "autocxx-build"
-version = "0.23.1"
+version = "0.24.0"
 authors = ["Adrian Taylor <adetaylor@chromium.org>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -22,7 +22,7 @@ runtime = ["autocxx-engine/runtime"]
 static = ["autocxx-engine/static"]
 
 [dependencies]
-autocxx-engine = { version = "=0.23.1", path = "../../engine", features = [
+autocxx-engine = { version = "=0.24.0", path = "../../engine", features = [
     "build",
 ] }
 env_logger = "0.9.0"

diff --git a/gen/cmd/Cargo.toml b/gen/cmd/Cargo.toml
@@ -8,7 +8,7 @@
 
 [package]
 name = "autocxx-gen"
-version = "0.23.1"
+version = "0.24.0"
 authors = ["Adrian Taylor <adetaylor@chromium.org>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -22,7 +22,7 @@ runtime = ["autocxx-engine/runtime"]
 static = ["autocxx-engine/static"]
 
 [dependencies]
-autocxx-engine = { version = "=0.23.1", path = "../../engine" }
+autocxx-engine = { version = "=0.24.0", path = "../../engine" }
 clap = { version = "3.1.2", features = ["cargo"] }
 proc-macro2 = "1.0"
 env_logger = "0.9.0"
@@ -36,6 +36,6 @@ tempfile = "3.1"
 # This is necessary for building the projects created
 # by the trybuild test system...
 autocxx = { path = "../.." }
-autocxx-integration-tests = { path = "../../integration-tests", version = "=0.23.1" }
+autocxx-integration-tests = { path = "../../integration-tests", version = "=0.24.0" }
 cxx = "1.0.78"
 itertools = "0.10.3"
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -8,7 +8,7 @@
 
 [package]
 name = "autocxx-integration-tests"
-version = "0.23.1"
+version = "0.24.0"
 autotests = false
 edition = "2021"
 authors = ["Adrian Taylor <adetaylor@chromium.org>"]
@@ -29,8 +29,8 @@ quote = "1.0"
 once_cell = "1.7"
 # This is necessary for building the projects created
 # by the trybuild test system...
-autocxx = { path = "..", version = "=0.23.1" }
-autocxx-engine = { version = "=0.23.1", path = "../engine", features = [
+autocxx = { path = "..", version = "=0.24.0" }
+autocxx-engine = { version = "=0.24.0", path = "../engine", features = [
     "build",
 ] }
 link-cplusplus = "1.0"

diff --git a/macro/Cargo.toml b/macro/Cargo.toml
@@ -8,7 +8,7 @@
 
 [package]
 name = "autocxx-macro"
-version = "0.23.1"
+version = "0.24.0"
 authors = ["Adrian Taylor <adetaylor@chromium.org>"]
 license = "MIT OR Apache-2.0"
 description = "Safe autogenerated interop between Rust and C++"
@@ -21,7 +21,7 @@ categories = ["development-tools::ffi", "api-bindings"]
 proc-macro = true
 
 [dependencies]
-autocxx-parser = { path = "../parser", version = "=0.23.1" }
+autocxx-parser = { path = "../parser", version = "=0.24.0" }
 proc-macro-error = "1.0"
 proc-macro2 = "1.0.11"
 quote = "1.0"

diff --git a/parser/Cargo.toml b/parser/Cargo.toml
@@ -8,7 +8,7 @@
 
 [package]
 name = "autocxx-parser"
-version = "0.23.1"
+version = "0.24.0"
 authors = ["Adrian Taylor <adetaylor@chromium.org>"]
 license = "MIT OR Apache-2.0"
 description = "Safe autogenerated interop between Rust and C++"

diff --git a/tools/mdbook-preprocessor/Cargo.toml b/tools/mdbook-preprocessor/Cargo.toml
@@ -8,7 +8,7 @@
 
 [package]
 name = "autocxx-mdbook-preprocessor"
-version = "0.23.1"
+version = "0.24.0"
 authors = ["adetaylor <adetaylor@chromium.org>"]
 edition = "2021"
 
@@ -18,7 +18,7 @@ serde_json = "1"
 itertools = "0.10"
 anyhow = "1"
 regex = "1"
-autocxx-integration-tests = { path = "../../integration-tests", version = "=0.23.1" }
+autocxx-integration-tests = { path = "../../integration-tests", version = "=0.24.0" }
 rayon = "1.5"
 gag = "1.0"
 env_logger = "0.9.0"