summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <matthias.beyer@ifm.com>2022-06-23 16:53:02 +0200
committerMatthias Beyer <matthias.beyer@ifm.com>2022-06-23 17:02:24 +0200
commitd121b6adc7db03e63bbbb4fd99a1ab1173238f7b (patch)
treed7d3ff5862f4d8e88f88469bcaf0b19f6a043d34
parent3673dffbe89ca0125cf06ba8a399a468fca5b485 (diff)
plugin_mqtt: Replace type_uuid with bevy_reflect
This patch replaces the type_uuid with the bevy_reflect crate, to fix the crate for the change from commit 10ef8e00bd7c78ed709c933edd92a59cc885e341 ("Change TypeUuid implementation to bevy_reflect") Signed-off-by: Matthias Beyer <matthias.beyer@ifm.com>
-rw-r--r--Cargo.lock22
-rw-r--r--plugins/plugin_mqtt/Cargo.toml2
-rw-r--r--plugins/plugin_mqtt/src/message.rs4
3 files changed, 4 insertions, 24 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 2fa669d0..63a3d05d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2412,6 +2412,7 @@ version = "0.1.0"
dependencies = [
"async-trait",
"backoff 0.4.0",
+ "bevy_reflect",
"futures",
"log",
"miette",
@@ -2424,7 +2425,6 @@ dependencies = [
"tokio-util 0.7.3",
"toml",
"tracing",
- "type-uuid",
]
[[package]]
@@ -4224,26 +4224,6 @@ dependencies = [
]
[[package]]
-name = "type-uuid"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15043bca41f43205c9b0055d365a405d81b8e4a8ff99c36b263cf79ad1f4c051"
-dependencies = [
- "type-uuid-derive",
-]
-
-[[package]]
-name = "type-uuid-derive"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e090ee857961c746ecf7fb596022493ffaad54d189061df49f7a0cf17796dc1"
-dependencies = [
- "quote 1.0.20",
- "syn 1.0.98",
- "uuid",
-]
-
-[[package]]
name = "typed-arena"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/plugins/plugin_mqtt/Cargo.toml b/plugins/plugin_mqtt/Cargo.toml
index 8a62e1b5..be9f14c2 100644
--- a/plugins/plugin_mqtt/Cargo.toml
+++ b/plugins/plugin_mqtt/Cargo.toml
@@ -18,7 +18,7 @@ tokio = { version = "1", features = [] }
tokio-util = "0.7.0"
tracing = "0.1"
toml = "0.5"
-type-uuid = "0.1.2"
+bevy_reflect = "0.7.0"
tedge_api = { path = "../../crates/core/tedge_api" }
tedge_lib = { path = "../../crates/core/tedge_lib" }
diff --git a/plugins/plugin_mqtt/src/message.rs b/plugins/plugin_mqtt/src/message.rs
index 0ee2fd5a..3f1009f9 100644
--- a/plugins/plugin_mqtt/src/message.rs
+++ b/plugins/plugin_mqtt/src/message.rs
@@ -3,7 +3,7 @@
use tedge_api::PluginError;
// A message that was received over MQTT by this plugin and is to be send to another plugin
-#[derive(Debug, type_uuid::TypeUuid)]
+#[derive(Debug, bevy_reflect::TypeUuid)]
#[uuid = "61d5df16-7f0c-4d3d-8a90-e8a7cd6f5545"]
pub struct IncomingMessage {
pub(crate) payload: Vec<u8>,
@@ -38,7 +38,7 @@ impl tedge_api::Message for IncomingMessage {}
tedge_api::make_receiver_bundle!(pub struct MqttMessageReceiver(IncomingMessage));
-#[derive(Debug, type_uuid::TypeUuid)]
+#[derive(Debug, bevy_reflect::TypeUuid)]
#[uuid = "b71dd332-1e67-4be1-8824-a4b6cf547d5f"]
pub struct OutgoingMessage {
pub(crate) payload: Vec<u8>,