From 51d2c92d9ef9609721240f9f03ea6493d5711623 Mon Sep 17 00:00:00 2001
From: Artem Vorotnikov <artem@vorotnikov.me>
Date: Tue, 23 Aug 2022 10:22:47 +0300
Subject: [PATCH] Update deps, format TOML

---
 Cargo.lock                                    | 29 ++++++++++++++-----
 book/src/tutorial.md                          |  2 +-
 demo/Cargo.toml                               |  6 ++--
 engine/Cargo.toml                             | 18 ++++++------
 .../Cargo.toml                                |  6 ++--
 examples/llvm/Cargo.toml                      |  6 ++--
 examples/non-trivial-type-on-stack/Cargo.toml |  6 ++--
 examples/pod/Cargo.toml                       |  6 ++--
 examples/reference-wrappers/Cargo.toml        |  6 ++--
 examples/s2/Cargo.toml                        |  6 ++--
 examples/steam-mini/Cargo.toml                |  6 ++--
 examples/subclass/Cargo.toml                  |  8 ++---
 gen/build/Cargo.toml                          | 10 ++++---
 gen/cmd/Cargo.toml                            | 16 +++++-----
 integration-tests/Cargo.toml                  |  8 +++--
 macro/Cargo.toml                              |  4 +--
 parser/Cargo.toml                             |  6 ++--
 tools/stress-test/Cargo.toml                  |  6 ++--
 18 files changed, 87 insertions(+), 68 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 88771cf5c..e7be2c861 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -59,6 +59,20 @@ dependencies = [
  "wait-timeout",
 ]
 
+[[package]]
+name = "assert_cmd"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e"
+dependencies = [
+ "bstr",
+ "doc-comment",
+ "predicates",
+ "predicates-core",
+ "predicates-tree",
+ "wait-timeout",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -89,7 +103,8 @@ dependencies = [
 [[package]]
 name = "autocxx-bindgen"
 version = "0.60.1"
-source = "git+https://github.com/adetaylor/rust-bindgen?branch=rev-0.60.1#edc8b7f8e51ddba7ccdd4392c995232e561a4de4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12cac0c415c83293fa3253de2f4384652a4b07bc5a21e3bf4efae9283aff3c1d"
 dependencies = [
  "bitflags",
  "cexpr",
@@ -160,7 +175,7 @@ dependencies = [
 name = "autocxx-gen"
 version = "0.22.3"
 dependencies = [
- "assert_cmd",
+ "assert_cmd 2.0.4",
  "autocxx",
  "autocxx-engine",
  "autocxx-integration-tests",
@@ -247,7 +262,7 @@ dependencies = [
 name = "autocxx-reduce"
 version = "0.22.3"
 dependencies = [
- "assert_cmd",
+ "assert_cmd 1.0.8",
  "autocxx-engine",
  "autocxx-parser",
  "clap",
@@ -797,9 +812,9 @@ dependencies = [
 
 [[package]]
 name = "miette"
-version = "4.4.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a097de91d72c13382f60213ed9f7f7a26afd8bee0ea320b47f886a9a67ca5a1"
+checksum = "a28d6092d7e94a90bb9ea8e6c26c99d5d112d49dda2afdb4f7ea8cf09e1a5a6d"
 dependencies = [
  "atty",
  "backtrace",
@@ -817,9 +832,9 @@ dependencies = [
 
 [[package]]
 name = "miette-derive"
-version = "4.4.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a95a48d0bc28f9af628286e8a4da09f96f34a97744a2e9a5a4db9814ad527d"
+checksum = "4f2485ed7d1fe80704928e3eb86387439609bd0c6bb96db8208daa364cfd1e09"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/book/src/tutorial.md b/book/src/tutorial.md
index 3e8e5b224..b3de4f405 100644
--- a/book/src/tutorial.md
+++ b/book/src/tutorial.md
@@ -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:
diff --git a/demo/Cargo.toml b/demo/Cargo.toml
index e81cb80c7..ab7410442 100644
--- a/demo/Cargo.toml
+++ b/demo/Cargo.toml
@@ -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"] }
diff --git a/engine/Cargo.toml b/engine/Cargo.toml
index 6031fbd5e..376706b8d 100644
--- a/engine/Cargo.toml
+++ b/engine/Cargo.toml
@@ -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"
@@ -38,14 +38,14 @@ 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"
@@ -53,7 +53,7 @@ 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]
diff --git a/examples/chromium-fake-render-frame-host/Cargo.toml b/examples/chromium-fake-render-frame-host/Cargo.toml
index 3862f2c0f..513301886 100644
--- 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.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"] }
diff --git a/examples/llvm/Cargo.toml b/examples/llvm/Cargo.toml
index 4c03db74c..7f01c1060 100644
--- a/examples/llvm/Cargo.toml
+++ b/examples/llvm/Cargo.toml
@@ -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"] }
diff --git a/examples/non-trivial-type-on-stack/Cargo.toml b/examples/non-trivial-type-on-stack/Cargo.toml
index 110bd1b82..9a16eaa4b 100644
--- 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.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"] }
diff --git a/examples/pod/Cargo.toml b/examples/pod/Cargo.toml
index 9f4ee5a5b..603c00070 100644
--- a/examples/pod/Cargo.toml
+++ b/examples/pod/Cargo.toml
@@ -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"] }
diff --git a/examples/reference-wrappers/Cargo.toml b/examples/reference-wrappers/Cargo.toml
index cb85e800a..ec617c207 100644
--- a/examples/reference-wrappers/Cargo.toml
+++ b/examples/reference-wrappers/Cargo.toml
@@ -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"] }
diff --git a/examples/s2/Cargo.toml b/examples/s2/Cargo.toml
index 04524b19d..9aa5b05c4 100644
--- a/examples/s2/Cargo.toml
+++ b/examples/s2/Cargo.toml
@@ -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"] }
diff --git a/examples/steam-mini/Cargo.toml b/examples/steam-mini/Cargo.toml
index ceb81ffa2..89cf0b03f 100644
--- a/examples/steam-mini/Cargo.toml
+++ b/examples/steam-mini/Cargo.toml
@@ -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"] }
diff --git a/examples/subclass/Cargo.toml b/examples/subclass/Cargo.toml
index dc93f5317..863f2d405 100644
--- a/examples/subclass/Cargo.toml
+++ b/examples/subclass/Cargo.toml
@@ -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"] }
diff --git a/gen/build/Cargo.toml b/gen/build/Cargo.toml
index 678a84447..ac77db1da 100644
--- a/gen/build/Cargo.toml
+++ b/gen/build/Cargo.toml
@@ -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"]
diff --git a/gen/cmd/Cargo.toml b/gen/cmd/Cargo.toml
index 51eb56c44..7ff438494 100644
--- a/gen/cmd/Cargo.toml
+++ b/gen/cmd/Cargo.toml
@@ -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"
\ No newline at end of file
+itertools = "0.10.3"
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
index 7791ea501..8cdececea 100644
--- a/integration-tests/Cargo.toml
+++ b/integration-tests/Cargo.toml
@@ -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"
@@ -40,7 +42,7 @@ itertools = "0.10"
 
 [dependencies.syn]
 version = "1.0.39"
-features = [ "full" ]
+features = ["full"]
 #features = [ "full", "extra-traits" ]
 
 [[test]]
diff --git a/macro/Cargo.toml b/macro/Cargo.toml
index 1f81ab153..4890b50da 100644
--- a/macro/Cargo.toml
+++ b/macro/Cargo.toml
@@ -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"]
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
index 3668e6567..0d93746a8 100644
--- a/parser/Cargo.toml
+++ b/parser/Cargo.toml
@@ -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 = []
diff --git a/tools/stress-test/Cargo.toml b/tools/stress-test/Cargo.toml
index a651f60c6..736da8051 100644
--- a/tools/stress-test/Cargo.toml
+++ b/tools/stress-test/Cargo.toml
@@ -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"] }