From 90194ea5f2796ddce707631e413a3c4eead902e1 Mon Sep 17 00:00:00 2001 From: Nicolas Belouin Date: Thu, 27 Apr 2023 11:07:44 +0200 Subject: [PATCH] Upgrade to 2021 edition This is needed to be able to upgrade prost dependency Signed-off-by: Nicolas Belouin --- agent/Cargo.toml | 2 +- controller/Cargo.toml | 2 +- .../debug-echo-discovery-handler/Cargo.toml | 2 +- discovery-handler-modules/onvif-discovery-handler/Cargo.toml | 2 +- discovery-handler-modules/opcua-discovery-handler/Cargo.toml | 2 +- discovery-handler-modules/udev-discovery-handler/Cargo.toml | 2 +- discovery-handlers/debug-echo/Cargo.toml | 2 +- discovery-handlers/onvif/Cargo.toml | 2 +- discovery-handlers/opcua/Cargo.toml | 2 +- discovery-handlers/udev/Cargo.toml | 2 +- discovery-utils/Cargo.toml | 2 +- samples/brokers/udev-video-broker/Cargo.toml | 2 +- shared/Cargo.toml | 2 +- shared/src/uds/unix_stream.rs | 1 - webhooks/validating/configuration/Cargo.toml | 2 +- 15 files changed, 14 insertions(+), 15 deletions(-) diff --git a/agent/Cargo.toml b/agent/Cargo.toml index 2cd1e4a7c..fe949d776 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -2,7 +2,7 @@ name = "agent" version = "0.10.11" authors = ["Kate Goldenring ", ""] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 91bf6f504..92f039b8a 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -2,7 +2,7 @@ name = "controller" version = "0.10.11" authors = ["", ""] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index 6c373518f..d6379ea3c 100644 --- a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml @@ -2,7 +2,7 @@ name = "debug-echo-discovery-handler" version = "0.10.11" authors = ["Kate Goldenring "] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml index 771239fe2..72cca0a50 100644 --- a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml @@ -2,7 +2,7 @@ name = "onvif-discovery-handler" version = "0.10.11" authors = ["Kate Goldenring "] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml index b3badeb96..5aaa82b4a 100644 --- a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml @@ -2,7 +2,7 @@ name = "opcua-discovery-handler" version = "0.10.11" authors = ["Kate Goldenring "] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml index 51e61198c..e265ffecd 100644 --- a/discovery-handler-modules/udev-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/udev-discovery-handler/Cargo.toml @@ -2,7 +2,7 @@ name = "udev-discovery-handler" version = "0.10.11" authors = ["Kate Goldenring "] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index add11e517..f3372a3f3 100644 --- a/discovery-handlers/debug-echo/Cargo.toml +++ b/discovery-handlers/debug-echo/Cargo.toml @@ -2,7 +2,7 @@ name = "akri-debug-echo" version = "0.10.11" authors = ["Kate Goldenring "] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index 54a537c78..5a8925882 100644 --- a/discovery-handlers/onvif/Cargo.toml +++ b/discovery-handlers/onvif/Cargo.toml @@ -2,7 +2,7 @@ name = "akri-onvif" version = "0.10.11" authors = ["Kate Goldenring "] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index 32a145c7d..f84451818 100644 --- a/discovery-handlers/opcua/Cargo.toml +++ b/discovery-handlers/opcua/Cargo.toml @@ -2,7 +2,7 @@ name = "akri-opcua" version = "0.10.11" authors = ["Kate Goldenring "] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index f345a9082..d8a051f4d 100644 --- a/discovery-handlers/udev/Cargo.toml +++ b/discovery-handlers/udev/Cargo.toml @@ -2,7 +2,7 @@ name = "akri-udev" version = "0.10.11" authors = ["Kate Goldenring "] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index 0e8083a1e..7d4639afd 100644 --- a/discovery-utils/Cargo.toml +++ b/discovery-utils/Cargo.toml @@ -2,7 +2,7 @@ name = "akri-discovery-utils" version = "0.10.11" authors = ["Kate Goldenring "] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index 2194077d4..5e855de51 100644 --- a/samples/brokers/udev-video-broker/Cargo.toml +++ b/samples/brokers/udev-video-broker/Cargo.toml @@ -2,7 +2,7 @@ name = "udev-video-broker" version = "0.10.11" authors = ["Kate Goldenring ", ""] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 41e6a491f..b63817391 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -2,7 +2,7 @@ name = "akri-shared" version = "0.10.11" authors = [""] -edition = "2018" +edition = "2021" rust-version = "1.68.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/shared/src/uds/unix_stream.rs b/shared/src/uds/unix_stream.rs index 404f58dfc..d0413a935 100644 --- a/shared/src/uds/unix_stream.rs +++ b/shared/src/uds/unix_stream.rs @@ -58,7 +58,6 @@ impl AsyncWrite for UnixStream { } pub async fn try_connect(socket_path: &str) -> Result<(), anyhow::Error> { - use std::convert::TryFrom; use std::time::{Duration, SystemTime, UNIX_EPOCH}; // Test that server is running, trying for at most 10 seconds diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml index dbfcb0578..4f303f6f7 100644 --- a/webhooks/validating/configuration/Cargo.toml +++ b/webhooks/validating/configuration/Cargo.toml @@ -2,7 +2,7 @@ name = "webhook-configuration" version = "0.10.11" authors = ["DazWilkin "] -edition = "2018" +edition = "2021" rust-version = "1.68.1" [dependencies]