summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <matthias.beyer@ifm.com>2022-08-01 09:06:22 +0200
committerMatthias Beyer <matthias.beyer@ifm.com>2022-08-30 13:55:04 +0200
commit6243156a748c737c470e7b62ee4b0fe2e286bbe6 (patch)
treeb7d9dbc20d3057fefc8bdcc4f7d3cc8c6cb477eb
parent82e19c2cd5f4502a1ae9fffc392d18e7724da1b7 (diff)
tedge_api: Update bevy_reflect: 0.7.0 -> 0.8.0post-merge/update-and-unvendor-bevy-reflect
Signed-off-by: Matthias Beyer <matthias.beyer@ifm.com>
-rw-r--r--Cargo.lock174
-rw-r--r--crates/core/tedge_api/Cargo.toml2
2 files changed, 27 insertions, 149 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 4f4ecda3..bce9ca4b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -295,32 +295,10 @@ dependencies = [
]
[[package]]
-name = "bevy_derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6abddf2ed415f31d28a9bf9ab3c0bc857e98a722858d38dba65bdda481f8d714"
-dependencies = [
- "bevy_macro_utils 0.7.0",
- "quote 1.0.21",
- "syn 1.0.99",
-]
-
-[[package]]
-name = "bevy_macro_utils"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7ddfc33a99547e36718e56e414541e461c74ec318ff987a1e9f4ff46d0dacbb"
-dependencies = [
- "cargo-manifest",
- "quote 1.0.21",
- "syn 1.0.99",
-]
-
-[[package]]
name = "bevy_macro_utils"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d081af83b701e16cad209255ba6b383744dfa49efa99eb6505989f293305ab3"
+checksum = "43fb5137e5198302d7c6c33d1e454cf48a586e7c6fd12f4860f12863951e16b9"
dependencies = [
"quote 1.0.21",
"syn 1.0.99",
@@ -329,95 +307,52 @@ dependencies = [
[[package]]
name = "bevy_ptr"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92d5679e89602a18682a37846573dcd1979410179e14204280460ba9fb8713a"
-
-[[package]]
-name = "bevy_reflect"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d0793107bc4b7c6bd04232d739fc8d70aa5fb313bfad6e850f91f79b2557eed"
-dependencies = [
- "bevy_reflect_derive 0.7.0",
- "bevy_utils 0.7.0",
- "downcast-rs",
- "erased-serde",
- "parking_lot 0.11.2",
- "serde",
- "thiserror",
-]
+checksum = "9960c19e582b43cebe1894b6679520a4f50802d1cc5b6fa432f8d685ed232f09"
[[package]]
name = "bevy_reflect"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08798e67f2d4e6898ef117d8c99cf3b50a8eebc8da4159e6dad2657a0fbe9a4e"
+checksum = "3fc689dd7a7df3b3768884a4754711d406aa302ea48da483c03b52715fa95045"
dependencies = [
"bevy_ptr",
- "bevy_reflect_derive 0.8.0",
- "bevy_utils 0.8.0",
+ "bevy_reflect_derive",
+ "bevy_utils",
"downcast-rs",
"erased-serde",
"once_cell",
- "parking_lot 0.12.1",
+ "parking_lot",
"serde",
"thiserror",
]
[[package]]
name = "bevy_reflect_derive"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81c88de8067d19dfde31662ee78e3ee6971e2df27715799f91b515b37a636677"
-dependencies = [
- "bevy_macro_utils 0.7.0",
- "proc-macro2 1.0.43",
- "quote 1.0.21",
- "syn 1.0.99",
- "uuid 0.8.2",
-]
-
-[[package]]
-name = "bevy_reflect_derive"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19209a7f0238053802b7de04e6724bd90d4ed7d90e87101dbd1b64cca64ff694"
+checksum = "8c36fa5100832c787c10558d31632ddc454c221e8dfacbbef836938f59614754"
dependencies = [
- "bevy_macro_utils 0.8.0",
+ "bevy_macro_utils",
"proc-macro2 1.0.43",
"quote 1.0.21",
"syn 1.0.99",
- "uuid 1.1.2",
-]
-
-[[package]]
-name = "bevy_utils"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f354c584812996febd48cc885f36b23004b49d6680e73fc95a69a2bb17a48e5"
-dependencies = [
- "ahash",
- "bevy_derive",
- "getrandom",
- "hashbrown 0.11.2",
- "instant",
- "tracing",
- "uuid 0.8.2",
+ "uuid",
]
[[package]]
name = "bevy_utils"
-version = "0.8.0"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bda6dada53e546845887ae7357eec57b8d547ef71627b716b33839b4a98b687"
+checksum = "f6e9aa1866c1cf7ee000f281ce9e90d02d701f5c7380a107252017e58e2f5246"
dependencies = [
"ahash",
"getrandom",
- "hashbrown 0.12.3",
+ "hashbrown",
"instant",
"tracing",
- "uuid 1.1.2",
+ "uuid",
]
[[package]]
@@ -640,17 +575,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
[[package]]
-name = "cargo-manifest"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf5acda331466fdea759172dbc2fb9e650e382dbca6a8dd3f576d9aeeac76da6"
-dependencies = [
- "serde",
- "serde_derive",
- "toml",
-]
-
-[[package]]
name = "cast"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -944,7 +868,7 @@ dependencies = [
"crossterm_winapi",
"libc",
"mio",
- "parking_lot 0.12.1",
+ "parking_lot",
"signal-hook",
"signal-hook-mio",
"winapi",
@@ -1493,16 +1417,6 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
- "serde",
-]
-
-[[package]]
-name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
@@ -1680,7 +1594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
dependencies = [
"autocfg",
- "hashbrown 0.12.3",
+ "hashbrown",
]
[[package]]
@@ -2367,37 +2281,12 @@ dependencies = [
[[package]]
name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.5",
-]
-
-[[package]]
-name = "parking_lot"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.3",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if 1.0.0",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
+ "parking_lot_core",
]
[[package]]
@@ -2586,7 +2475,7 @@ version = "0.1.0"
dependencies = [
"async-trait",
"backoff",
- "bevy_reflect 0.7.0",
+ "bevy_reflect",
"futures",
"log",
"miette",
@@ -3332,7 +3221,7 @@ dependencies = [
"futures",
"lazy_static",
"log",
- "parking_lot 0.12.1",
+ "parking_lot",
"serial_test_derive",
]
@@ -3680,7 +3569,7 @@ name = "tedge_api"
version = "0.1.0"
dependencies = [
"async-trait",
- "bevy_reflect 0.7.0",
+ "bevy_reflect",
"downcast-rs",
"futures",
"miette",
@@ -3741,7 +3630,7 @@ name = "tedge_core"
version = "0.1.0"
dependencies = [
"async-trait",
- "bevy_reflect 0.8.0",
+ "bevy_reflect",
"criterion",
"env_logger 0.9.0",
"futures",
@@ -3772,7 +3661,7 @@ name = "tedge_lib"
version = "0.1.0"
dependencies = [
"async-trait",
- "bevy_reflect 0.7.0",
+ "bevy_reflect",
"futures",
"humantime-serde",
"indoc",
@@ -4106,7 +3995,7 @@ dependencies = [
"mio",
"num_cpus",
"once_cell",
- "parking_lot 0.12.1",
+ "parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2",
@@ -4218,7 +4107,6 @@ version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
dependencies = [
- "indexmap",
"serde",
]
@@ -4486,16 +4374,6 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
name = "uuid"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
-dependencies = [
- "getrandom",
- "serde",
-]
-
-[[package]]
-name = "uuid"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
diff --git a/crates/core/tedge_api/Cargo.toml b/crates/core/tedge_api/Cargo.toml
index 81a55412..eda00fe1 100644
--- a/crates/core/tedge_api/Cargo.toml
+++ b/crates/core/tedge_api/Cargo.toml
@@ -17,7 +17,7 @@ toml = "0.5.8"
serde = { version = "1.0.136", features = ["derive"] }
tedge_config_derive = { version = "0.1.0", path = "tedge_config_derive" }
tracing = "0.1"
-bevy_reflect = "0.7.0"
+bevy_reflect = "0.8.0"
[dev-dependencies]
pretty_assertions = "1.2.1"