Skip to content

Commit a3ab76c

Browse files
adetayloradetaylor
authored
Merge pull request #1222 from google/rev-0.24
Revise to 0.24.0
2 parents 9e69fae + 1100f09 commit a3ab76c

File tree

23 files changed

+60
-63
lines changed

23 files changed

+60
-63
lines changed

‎Cargo.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
[package]
1010
name = "autocxx"
11-
version = "0.23.1"
11+
version = "0.24.0"
1212
authors = ["Adrian Taylor <adetaylor@chromium.org>"]
1313
license = "MIT OR Apache-2.0"
1414
description = "Safe autogenerated interop between Rust and C++"
@@ -25,7 +25,7 @@ exclude = [ ".github", "book", "tools" ]
2525
resolver = "2"
2626

2727
[dependencies]
28-
autocxx-macro = { path="macro", version="0.23.1" }
28+
autocxx-macro = { path="macro", version="0.24.0" }
2929
cxx = "1.0.78" # ... also needed because expansion of type_id refers to ::cxx
3030
aquamarine = "0.1" # docs
3131
moveit = { version = "0.5", features = [ "cxx" ] }

‎book/src/tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ First, add `autocxx` *and `cxx`* to your `dependencies` and `autocxx-build` to y
2121

2222
```toml
2323
[dependencies]
24-
autocxx = "0.23.1"
24+
autocxx = "0.24.0"
2525
cxx = "1.0"
2626

2727
[build-dependencies]
28-
autocxx-build = "0.23.1"
28+
autocxx-build = "0.24.0"
2929
miette = { version = "5", features = ["fancy"] } # optional but gives nicer error messages!
3030
```
3131

‎demo/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
[package]
1010
name = "autocxx-demo"
11-
version = "0.23.1"
11+
version = "0.24.0"
1212
authors = ["Adrian Taylor <adetaylor@chromium.org>"]
1313
edition = "2021"
1414

1515
[dependencies]
1616
cxx = "1.0.78"
17-
autocxx = { path = "..", version = "0.23.1" }
17+
autocxx = { path = "..", version = "0.24.0" }
1818

1919
[build-dependencies]
20-
autocxx-build = { path = "../gen/build", version = "0.23.1" }
20+
autocxx-build = { path = "../gen/build", version = "0.24.0" }
2121
miette = { version = "5", features = ["fancy"] }

‎engine/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
[package]
1010
name = "autocxx-engine"
11-
version = "0.23.1"
11+
version = "0.24.0"
1212
authors = ["Adrian Taylor <adetaylor@chromium.org>"]
1313
license = "MIT OR Apache-2.0"
1414
description = "Safe autogenerated interop between Rust and C++"
@@ -38,7 +38,7 @@ cc = { version = "1.0", optional = true }
3838
# There can be interdependencies between the code generated by cxx-gen and
3939
# what cxx expects to be there.
4040
cxx-gen = "0.7.78"
41-
autocxx-parser = { version = "=0.23.1", path = "../parser" }
41+
autocxx-parser = { version = "=0.24.0", path = "../parser" }
4242
version_check = "0.9"
4343
aquamarine = "0.1" # docs
4444
tempfile = "3.1"

‎engine/src/conversion/api.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -731,20 +731,17 @@ impl<T: AnalysisPhase> Api<T> {
731731
/// just use `Debug` here, but some of the `syn` types make that awkward.
732732
pub(crate) fn details_display(&self) -> String {
733733
match self {
734-
Api::ForwardDeclaration { err, .. } => format!("{:?}", err),
734+
Api::ForwardDeclaration { err, .. } => format!("{err:?}"),
735735
Api::OpaqueTypedef {
736736
forward_declaration,
737737
..
738-
} => format!("forward_declaration={:?}", forward_declaration),
738+
} => format!("forward_declaration={forward_declaration:?}"),
739739
Api::ConcreteType {
740740
rs_definition,
741741
cpp_definition,
742742
..
743-
} => format!(
744-
"rs_definition={:?}, cpp_definition={}",
745-
rs_definition, cpp_definition
746-
),
747-
Api::ExternCppType { pod, .. } => format!("pod={}", pod),
743+
} => format!("rs_definition={rs_definition:?}, cpp_definition={cpp_definition}"),
744+
Api::ExternCppType { pod, .. } => format!("pod={pod}"),
748745
_ => String::new(),
749746
}
750747
}

‎examples/chromium-fake-render-frame-host/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ edition = "2021"
1414

1515
[dependencies]
1616
cxx = "1.0.78"
17-
autocxx = { path = "../..", version = "0.23.1" }
17+
autocxx = { path = "../..", version = "0.24.0" }
1818

1919
[build-dependencies]
20-
autocxx-build = { path = "../../gen/build", version = "0.23.1" }
20+
autocxx-build = { path = "../../gen/build", version = "0.24.0" }
2121
miette = { version = "5", features = ["fancy"] }

‎examples/cpp_calling_rust/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ edition = "2021"
1515

1616
[dependencies]
1717
cxx = "1.0.78"
18-
autocxx = { path = "../..", version="0.23.1" }
18+
autocxx = { path = "../..", version="0.24.0" }
1919
uwuify = "0.2.2"
2020
textwrap = "0.14"
2121
fastrand = "1.5.0"
2222

2323
[build-dependencies]
24-
autocxx-build = { path = "../../gen/build", version="0.23.1" }
24+
autocxx-build = { path = "../../gen/build", version="0.24.0" }
2525
regex = "1.5.4"
2626
miette = { version="5", features = [ "fancy" ] }

‎examples/llvm/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ edition = "2021"
1414

1515
[dependencies]
1616
cxx = "1.0.78"
17-
autocxx = { path = "../..", version = "0.23.1" }
17+
autocxx = { path = "../..", version = "0.24.0" }
1818

1919
[build-dependencies]
20-
autocxx-build = { path = "../../gen/build", version = "0.23.1" }
20+
autocxx-build = { path = "../../gen/build", version = "0.24.0" }
2121
miette = { version = "5", features = ["fancy"] }

‎examples/non-trivial-type-on-stack/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ edition = "2021"
1414

1515
[dependencies]
1616
cxx = "1.0.78"
17-
autocxx = { path = "../..", version = "0.23.1" }
17+
autocxx = { path = "../..", version = "0.24.0" }
1818

1919
[build-dependencies]
20-
autocxx-build = { path = "../../gen/build", version = "0.23.1" }
20+
autocxx-build = { path = "../../gen/build", version = "0.24.0" }
2121
miette = { version = "5", features = ["fancy"] }

‎examples/pod/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ edition = "2021"
1414

1515
[dependencies]
1616
cxx = "1.0.78"
17-
autocxx = { path = "../..", version = "0.23.1" }
17+
autocxx = { path = "../..", version = "0.24.0" }
1818

1919
[build-dependencies]
20-
autocxx-build = { path = "../../gen/build", version = "0.23.1" }
20+
autocxx-build = { path = "../../gen/build", version = "0.24.0" }
2121
miette = { version = "5", features = ["fancy"] }

‎examples/reference-wrappers/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ edition = "2021"
1414

1515
[dependencies]
1616
cxx = "1.0.78"
17-
autocxx = { path = "../..", version = "0.23.1" }
17+
autocxx = { path = "../..", version = "0.24.0" }
1818

1919
[build-dependencies]
20-
autocxx-build = { path = "../../gen/build", version = "0.23.1" }
20+
autocxx-build = { path = "../../gen/build", version = "0.24.0" }
2121
miette = { version = "5", features = ["fancy"] }

‎examples/s2/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ edition = "2021"
1616

1717
[dependencies]
1818
cxx = "1.0.78"
19-
autocxx = { path = "../..", version = "0.23.1" }
19+
autocxx = { path = "../..", version = "0.24.0" }
2020

2121
[build-dependencies]
22-
autocxx-build = { path = "../../gen/build", version = "0.23.1" }
22+
autocxx-build = { path = "../../gen/build", version = "0.24.0" }
2323
miette = { version = "5", features = ["fancy"] }

‎examples/steam-mini/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ edition = "2021"
1616

1717
[dependencies]
1818
cxx = "1.0.78"
19-
autocxx = { path = "../..", version = "0.23.1" }
19+
autocxx = { path = "../..", version = "0.24.0" }
2020

2121
[build-dependencies]
22-
autocxx-build = { path = "../../gen/build", version = "0.23.1" }
22+
autocxx-build = { path = "../../gen/build", version = "0.24.0" }
2323
miette = { version = "5", features = ["fancy"] }

‎examples/subclass/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ edition = "2021"
1616

1717
[dependencies]
1818
cxx = "1.0.78"
19-
autocxx = { path = "../..", version = "0.23.1" }
19+
autocxx = { path = "../..", version = "0.24.0" }
2020
uwuify = "0.2.2"
2121
textwrap = "0.15"
2222
fastrand = "1.5.0"
2323

2424
[build-dependencies]
25-
autocxx-build = { path = "../../gen/build", version = "0.23.1" }
25+
autocxx-build = { path = "../../gen/build", version = "0.24.0" }
2626
regex = "1.5.4"
2727
miette = { version = "5", features = ["fancy"] }

‎gen/build/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
[package]
1010
name = "autocxx-build"
11-
version = "0.23.1"
11+
version = "0.24.0"
1212
authors = ["Adrian Taylor <adetaylor@chromium.org>"]
1313
edition = "2021"
1414
license = "MIT OR Apache-2.0"
@@ -22,7 +22,7 @@ runtime = ["autocxx-engine/runtime"]
2222
static = ["autocxx-engine/static"]
2323

2424
[dependencies]
25-
autocxx-engine = { version = "=0.23.1", path = "../../engine", features = [
25+
autocxx-engine = { version = "=0.24.0", path = "../../engine", features = [
2626
"build",
2727
] }
2828
env_logger = "0.9.0"

‎gen/cmd/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
[package]
1010
name = "autocxx-gen"
11-
version = "0.23.1"
11+
version = "0.24.0"
1212
authors = ["Adrian Taylor <adetaylor@chromium.org>"]
1313
edition = "2021"
1414
license = "MIT OR Apache-2.0"
@@ -22,7 +22,7 @@ runtime = ["autocxx-engine/runtime"]
2222
static = ["autocxx-engine/static"]
2323

2424
[dependencies]
25-
autocxx-engine = { version = "=0.23.1", path = "../../engine" }
25+
autocxx-engine = { version = "=0.24.0", path = "../../engine" }
2626
clap = { version = "3.1.2", features = ["cargo"] }
2727
proc-macro2 = "1.0"
2828
env_logger = "0.9.0"
@@ -36,6 +36,6 @@ tempfile = "3.1"
3636
# This is necessary for building the projects created
3737
# by the trybuild test system...
3838
autocxx = { path = "../.." }
39-
autocxx-integration-tests = { path = "../../integration-tests", version = "=0.23.1" }
39+
autocxx-integration-tests = { path = "../../integration-tests", version = "=0.24.0" }
4040
cxx = "1.0.78"
4141
itertools = "0.10.3"

‎integration-tests/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
[package]
1010
name = "autocxx-integration-tests"
11-
version = "0.23.1"
11+
version = "0.24.0"
1212
autotests = false
1313
edition = "2021"
1414
authors = ["Adrian Taylor <adetaylor@chromium.org>"]
@@ -29,8 +29,8 @@ quote = "1.0"
2929
once_cell = "1.7"
3030
# This is necessary for building the projects created
3131
# by the trybuild test system...
32-
autocxx = { path = "..", version = "=0.23.1" }
33-
autocxx-engine = { version = "=0.23.1", path = "../engine", features = [
32+
autocxx = { path = "..", version = "=0.24.0" }
33+
autocxx-engine = { version = "=0.24.0", path = "../engine", features = [
3434
"build",
3535
] }
3636
link-cplusplus = "1.0"

‎macro/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
[package]
1010
name = "autocxx-macro"
11-
version = "0.23.1"
11+
version = "0.24.0"
1212
authors = ["Adrian Taylor <adetaylor@chromium.org>"]
1313
license = "MIT OR Apache-2.0"
1414
description = "Safe autogenerated interop between Rust and C++"
@@ -21,7 +21,7 @@ categories = ["development-tools::ffi", "api-bindings"]
2121
proc-macro = true
2222

2323
[dependencies]
24-
autocxx-parser = { path = "../parser", version = "=0.23.1" }
24+
autocxx-parser = { path = "../parser", version = "=0.24.0" }
2525
proc-macro-error = "1.0"
2626
proc-macro2 = "1.0.11"
2727
quote = "1.0"

‎parser/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
[package]
1010
name = "autocxx-parser"
11-
version = "0.23.1"
11+
version = "0.24.0"
1212
authors = ["Adrian Taylor <adetaylor@chromium.org>"]
1313
license = "MIT OR Apache-2.0"
1414
description = "Safe autogenerated interop between Rust and C++"

‎tools/mdbook-preprocessor/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
[package]
1010
name = "autocxx-mdbook-preprocessor"
11-
version = "0.23.1"
11+
version = "0.24.0"
1212
authors = ["adetaylor <adetaylor@chromium.org>"]
1313
edition = "2021"
1414

@@ -18,7 +18,7 @@ serde_json = "1"
1818
itertools = "0.10"
1919
anyhow = "1"
2020
regex = "1"
21-
autocxx-integration-tests = { path = "../../integration-tests", version = "=0.23.1" }
21+
autocxx-integration-tests = { path = "../../integration-tests", version = "=0.24.0" }
2222
rayon = "1.5"
2323
gag = "1.0"
2424
env_logger = "0.9.0"

0 commit comments

Comments
 (0)