Skip to content

Commit

Permalink
Update deps, format TOML
Browse files Browse the repository at this point in the history
  • Loading branch information
@vorot93
vorot93 committed Aug 23, 2022
1 parent 7cfa5ea commit ed979e2
Show file tree
Hide file tree
Showing 20 changed files with 83 additions and 76 deletions.
15 changes: 8 additions & 7 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion book/src/tutorial.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cxx = "1.0"

[build-dependencies]
autocxx-build = "0.22.3"
miette = { version="4.3", features=["fancy"] } # optional but gives nicer error messages!
miette = { version="5", features=["fancy"] } # optional but gives nicer error messages!
```

Now, add a `build.rs` next to your `Cargo.toml` (this is a standard `cargo` [build script](https://doc.rust-lang.org/cargo/reference/build-scripts.html)). This is where you need your include path:
Expand Down
6 changes: 3 additions & 3 deletions demo/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ edition = "2021"

[dependencies]
cxx = "1.0.68"
autocxx = { path = "..", version="0.22.3" }
autocxx = { path = "..", version = "0.22.3" }

[build-dependencies]
autocxx-build = { path = "../gen/build", version="0.22.3" }
miette = { version="4.3", features=["fancy"]}
autocxx-build = { path = "../gen/build", version = "0.22.3" }
miette = { version = "5", features = ["fancy"] }
18 changes: 9 additions & 9 deletions engine/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ keywords = ["ffi"]
categories = ["development-tools::ffi", "api-bindings"]

[features]
default = [ "reproduction_case" ]
default = ["reproduction_case"]
build = ["cc"]
nightly = [] # for doc generation purposes only; used by docs.rs
reproduction_case = [ "serde_json", "autocxx-parser/reproduction_case" ]
runtime = [ "autocxx-bindgen/runtime" ]
static = [ "autocxx-bindgen/static" ]
nightly = [] # for doc generation purposes only; used by docs.rs
reproduction_case = ["serde_json", "autocxx-parser/reproduction_case"]
runtime = ["autocxx-bindgen/runtime"]
static = ["autocxx-bindgen/static"]

[dependencies]
log = "0.4"
Expand All @@ -38,22 +38,22 @@ 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.68"
autocxx-parser = { version = "=0.22.3", path="../parser" }
autocxx-parser = { version = "=0.22.3", path = "../parser" }
version_check = "0.9"
aquamarine = "0.1" # docs
aquamarine = "0.1" # docs
tempfile = "3.1"
once_cell = "1.7"
strum_macros = "0.24"
serde_json = { version = "1.0", optional = true }
miette = "4.3"
miette = "5"
thiserror = "1"
regex = "1.5"
indexmap = "1.8"
prettyplease = { version = "0.1.15", features = ["verbatim"] }

[dependencies.syn]
version = "1.0.39"
features = [ "full", "printing" ]
features = ["full", "printing"]
#features = [ "full", "printing", "extra-traits" ]

[package.metadata.docs.rs]
Expand Down
6 changes: 3 additions & 3 deletions examples/chromium-fake-render-frame-host/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ edition = "2021"

[dependencies]
cxx = "1.0.68"
autocxx = { path = "../..", version="0.22.3" }
autocxx = { path = "../..", version = "0.22.3" }

[build-dependencies]
autocxx-build = { path = "../../gen/build", version="0.22.3" }
miette = { version="4.3", features = [ "fancy" ] }
autocxx-build = { path = "../../gen/build", version = "0.22.3" }
miette = { version = "5", features = ["fancy"] }
6 changes: 3 additions & 3 deletions examples/llvm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ edition = "2021"

[dependencies]
cxx = "1.0.68"
autocxx = { path = "../..", version="0.17.2" }
autocxx = { path = "../..", version = "0.17.2" }

[build-dependencies]
autocxx-build = { path = "../../gen/build", version="0.17.2" }
miette = { version="4.3", features = [ "fancy" ] }
autocxx-build = { path = "../../gen/build", version = "0.17.2" }
miette = { version = "5", features = ["fancy"] }
6 changes: 3 additions & 3 deletions examples/non-trivial-type-on-stack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ edition = "2021"

[dependencies]
cxx = "1.0.68"
autocxx = { path = "../..", version="0.22.3" }
autocxx = { path = "../..", version = "0.22.3" }

[build-dependencies]
autocxx-build = { path = "../../gen/build", version="0.22.3" }
miette = { version="4.3", features = [ "fancy" ] }
autocxx-build = { path = "../../gen/build", version = "0.22.3" }
miette = { version = "5", features = ["fancy"] }
6 changes: 3 additions & 3 deletions examples/pod/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ edition = "2021"

[dependencies]
cxx = "1.0.68"
autocxx = { path = "../..", version="0.22.3" }
autocxx = { path = "../..", version = "0.22.3" }

[build-dependencies]
autocxx-build = { path = "../../gen/build", version="0.22.3" }
miette = { version="4.3", features = [ "fancy" ] }
autocxx-build = { path = "../../gen/build", version = "0.22.3" }
miette = { version = "5", features = ["fancy"] }
6 changes: 3 additions & 3 deletions examples/reference-wrappers/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ edition = "2021"

[dependencies]
cxx = "1.0.68"
autocxx = { path = "../..", version="0.22.3" }
autocxx = { path = "../..", version = "0.22.3" }

[build-dependencies]
autocxx-build = { path = "../../gen/build", version="0.22.3" }
miette = { version="4.3", features=["fancy"]}
autocxx-build = { path = "../../gen/build", version = "0.22.3" }
miette = { version = "5", features = ["fancy"] }
6 changes: 3 additions & 3 deletions examples/s2/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ edition = "2021"

[dependencies]
cxx = "1.0.68"
autocxx = { path = "../..", version="0.22.3" }
autocxx = { path = "../..", version = "0.22.3" }

[build-dependencies]
autocxx-build = { path = "../../gen/build", version="0.22.3" }
miette = { version="4.3", features = [ "fancy" ] }
autocxx-build = { path = "../../gen/build", version = "0.22.3" }
miette = { version = "5", features = ["fancy"] }
6 changes: 3 additions & 3 deletions examples/steam-mini/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ edition = "2021"

[dependencies]
cxx = "1.0.68"
autocxx = { path = "../..", version="0.22.3" }
autocxx = { path = "../..", version = "0.22.3" }

[build-dependencies]
autocxx-build = { path = "../../gen/build", version="0.22.3" }
miette = { version="4.3", features = [ "fancy" ] }
autocxx-build = { path = "../../gen/build", version = "0.22.3" }
miette = { version = "5", features = ["fancy"] }
8 changes: 4 additions & 4 deletions examples/subclass/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ edition = "2021"

[dependencies]
cxx = "1.0.68"
autocxx = { path = "../..", version="0.22.3" }
autocxx = { path = "../..", version = "0.22.3" }
uwuify = "0.2.2"
textwrap = "0.14"
textwrap = "0.15"
fastrand = "1.5.0"

[build-dependencies]
autocxx-build = { path = "../../gen/build", version="0.22.3" }
autocxx-build = { path = "../../gen/build", version = "0.22.3" }
regex = "1.5.4"
miette = { version="4.3", features = [ "fancy" ] }
miette = { version = "5", features = ["fancy"] }
10 changes: 6 additions & 4 deletions gen/build/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ keywords = ["ffi"]
categories = ["development-tools::ffi", "api-bindings"]

[features]
runtime = [ "autocxx-engine/runtime" ]
static = [ "autocxx-engine/static" ]
runtime = ["autocxx-engine/runtime"]
static = ["autocxx-engine/static"]

[dependencies]
autocxx-engine = { version="=0.22.3", path="../../engine", features = ["build"] }
autocxx-engine = { version = "=0.22.3", path = "../../engine", features = [
"build",
] }
env_logger = "0.9.0"
indexmap = "1.8"

[dependencies.syn]
version = "1.0"
features = [ "full" ]
features = ["full"]
16 changes: 8 additions & 8 deletions gen/cmd/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@ keywords = ["ffi"]
categories = ["development-tools::ffi", "api-bindings"]

[features]
runtime = [ "autocxx-engine/runtime" ]
static = [ "autocxx-engine/static" ]
runtime = ["autocxx-engine/runtime"]
static = ["autocxx-engine/static"]

[dependencies]
autocxx-engine = { version="=0.22.3", path="../../engine" }
autocxx-engine = { version = "=0.22.3", path = "../../engine" }
clap = { version = "3.1.2", features = ["cargo"] }
proc-macro2 = "1.0"
env_logger = "0.9.0"
miette = { version="4.3", features=["fancy"]}
miette = { version = "5", features = ["fancy"] }
pathdiff = "0.2.1"
indexmap = "1.8"

[dev-dependencies]
assert_cmd = "1.0.3"
assert_cmd = "2"
tempfile = "3.1"
autocxx-integration-tests = { path = "../../integration-tests", version="=0.22.3" }
autocxx-integration-tests = { path = "../../integration-tests", version = "=0.22.3" }
# This is necessary for building the projects created
# by the trybuild test system...
autocxx = { path="../.." }
autocxx = { path = "../.." }
cxx = "1.0.68"
itertools = "0.10.3"
itertools = "0.10.3"
8 changes: 5 additions & 3 deletions integration-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ rust_info = "0.3.1"
cc = "1.0"
quote = "1.0"
once_cell = "1.7"
autocxx-engine = { version="=0.22.3", path="../engine", features = ["build"] }
autocxx-engine = { version = "=0.22.3", path = "../engine", features = [
"build",
] }
# This is necessary for building the projects created
# by the trybuild test system...
autocxx = { path="..", version="=0.22.3" }
autocxx = { path = "..", version = "=0.22.3" }
link-cplusplus = "1.0"
tempfile = "3.1"
indoc = "1.0"
Expand All @@ -40,7 +42,7 @@ itertools = "0.10"

[dependencies.syn]
version = "1.0.39"
features = [ "full" ]
features = ["full"]
#features = [ "full", "extra-traits" ]

[[test]]
Expand Down
4 changes: 2 additions & 2 deletions macro/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ categories = ["development-tools::ffi", "api-bindings"]
proc-macro = true

[dependencies]
autocxx-parser = { path="../parser", version="=0.22.3" }
autocxx-parser = { path = "../parser", version = "=0.22.3" }
proc-macro-error = "1.0"
proc-macro2 = "1.0.11"
quote = "1.0"

[dependencies.syn]
version = "1.0"
features = [ "full" ]
features = ["full"]
6 changes: 3 additions & 3 deletions parser/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ categories = ["development-tools::ffi", "api-bindings"]
log = "0.4"
proc-macro2 = "1.0"
quote = "1.0"
serde = { version = "1.0", features = [ "derive" ]}
serde = { version = "1.0", features = ["derive"] }
thiserror = "1.0"
once_cell = "1.10"
itertools = "0.10.3"
indexmap = { version="1.8", features = ["serde"]}
indexmap = { version = "1.8", features = ["serde"] }
serde_json = "1.0"

[dependencies.syn]
version = "1.0.39"
features = [ "full", "extra-traits" ]
features = ["full", "extra-traits"]

[features]
reproduction_case = []
8 changes: 4 additions & 4 deletions tools/mdbook-preprocessor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ authors = ["adetaylor <adetaylor@chromium.org>"]
edition = "2021"

[dependencies]
clap = { version = "3", features = [ "cargo" ] }
clap = { version = "3", features = ["cargo"] }
serde_json = "1"
itertools = "0.10"
anyhow = "1"
regex = "1"
autocxx-integration-tests = { path = "../../integration-tests", version="=0.22.3"}
autocxx-integration-tests = { path = "../../integration-tests", version = "=0.22.3" }
rayon = "1.5"
gag = "1.0"
env_logger = "0.9.0"

[dependencies.syn]
version = "1.0.39"
features = [ "parsing" ]
features = ["parsing"]

[dependencies.proc-macro2]
version = "1.0.11"
features = [ "span-locations" ]
features = ["span-locations"]

[dependencies.mdbook]
version = "0.4"
Expand Down
10 changes: 6 additions & 4 deletions tools/reduce/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
autocxx-engine = { version = "=0.22.3", path="../../engine" }
autocxx-parser = { version = "=0.22.3", path="../../parser", features = [ "reproduction_case" ] }
autocxx-engine = { version = "=0.22.3", path = "../../engine" }
autocxx-parser = { version = "=0.22.3", path = "../../parser", features = [
"reproduction_case",
] }
clap = { version = "3.1.2", features = ["cargo"] }
tempfile = "3.1"
indoc = "1.0"
Expand All @@ -31,7 +33,7 @@ regex = "1.5"
indexmap = "1.8"

[dev-dependencies]
assert_cmd = "1.0.3"
assert_cmd = "2"
tempfile = "3.1"
indoc = "1.0"
proc-macro2 = "1.0"
proc-macro2 = "1.0"
6 changes: 3 additions & 3 deletions tools/stress-test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ edition = "2021"

[dependencies]
cxx = "1.0.68"
autocxx = { path = "../..", version="0.22.3" }
autocxx = { path = "../..", version = "0.22.3" }

[build-dependencies]
autocxx-build = { path = "../../gen/build", version="0.22.3" }
miette = { version="4.3", features=["fancy"]}
autocxx-build = { path = "../../gen/build", version = "0.22.3" }
miette = { version = "5", features = ["fancy"] }

0 comments on commit ed979e2

Please sign in to comment.