Migrate to edition 2021 (#558)

* Migrate to edition 2021
* Update docs and workflows
* Update to latest rust 1.58
* Force version in clippy

Signed-off-by: Lukasz Woznicki <lukasz.woznicki@softwareag.com>

22 files changed, 468 insertions, 22 deletions

diff --git a/crates/common/batcher/Cargo.toml b/crates/common/batcher/Cargo.toml
index f65906ea..d7a4bd59 100644
--- a/crates/common/batcher/Cargo.toml
+++ b/crates/common/batcher/Cargo.toml
@@ -2,7 +2,8 @@
 name = "batcher"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/crates/common/certificate/Cargo.toml b/crates/common/certificate/Cargo.toml
index fe9f2b01..0e4a4383 100644
--- a/crates/common/certificate/Cargo.toml
+++ b/crates/common/certificate/Cargo.toml
@@ -2,7 +2,8 @@
 name = "certificate"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/crates/common/clock/Cargo.toml b/crates/common/clock/Cargo.toml
index f677b41c..ab7e3a73 100644
--- a/crates/common/clock/Cargo.toml
+++ b/crates/common/clock/Cargo.toml
@@ -2,7 +2,8 @@
 name = "clock"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 [dependencies]
 time = { version = "0.3", features = ["serde-human-readable"] }
diff --git a/crates/common/download/Cargo.toml b/crates/common/download/Cargo.toml
index a7368997..830d68c2 100644
--- a/crates/common/download/Cargo.toml
+++ b/crates/common/download/Cargo.toml
@@ -2,7 +2,8 @@
 name = "download"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 license = "Apache-2.0"
 description = "download_manager"
 
diff --git a/crates/common/flockfile/Cargo.toml b/crates/common/flockfile/Cargo.toml
index f5a0e88b..ea7e80ad 100644
--- a/crates/common/flockfile/Cargo.toml
+++ b/crates/common/flockfile/Cargo.toml
@@ -2,7 +2,8 @@
 name = "flockfile"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 [dependencies]
 thiserror = "1.0"
diff --git a/crates/common/json_writer/Cargo.toml b/crates/common/json_writer/Cargo.toml
index 7608c797..0dec2d9d 100644
--- a/crates/common/json_writer/Cargo.toml
+++ b/crates/common/json_writer/Cargo.toml
@@ -2,7 +2,8 @@
 name = "json-writer"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 [dependencies]
 serde_json = "1"
diff --git a/crates/common/mqtt_client/Cargo.toml b/crates/common/mqtt_client/Cargo.toml
index 6f84729d..65bb05fc 100644
--- a/crates/common/mqtt_client/Cargo.toml
+++ b/crates/common/mqtt_client/Cargo.toml
@@ -2,7 +2,8 @@
 name = "mqtt_client"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 [dependencies]
 async-trait = "0.1"
diff --git a/crates/common/tedge_config/Cargo.toml b/crates/common/tedge_config/Cargo.toml
index 0a84bc28..dc82f240 100644
--- a/crates/common/tedge_config/Cargo.toml
+++ b/crates/common/tedge_config/Cargo.toml
@@ -2,7 +2,8 @@
 name = "tedge_config"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 [dependencies]
 certificate = { path = "../certificate" }
diff --git a/crates/common/tedge_users/Cargo.toml b/crates/common/tedge_users/Cargo.toml
index 75e5d18a..adf41083 100644
--- a/crates/common/tedge_users/Cargo.toml
+++ b/crates/common/tedge_users/Cargo.toml
@@ -2,7 +2,8 @@
 name = "tedge_users"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 [dependencies]
 thiserror = "1.0"
diff --git a/crates/common/tedge_utils/Cargo.toml b/crates/common/tedge_utils/Cargo.toml
index 2ca75c7c..9379e68b 100644
--- a/crates/common/tedge_utils/Cargo.toml
+++ b/crates/common/tedge_utils/Cargo.toml
@@ -2,7 +2,8 @@
 name = "tedge_utils"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 license = "Apache-2.0"
 description = "tedge_utils provide utilities for thin-edge.io components"
 
diff --git a/crates/core/agent_interface/Cargo.toml b/crates/core/agent_interface/Cargo.toml
index f2242405..0e83ec64 100644
--- a/crates/core/agent_interface/Cargo.toml
+++ b/crates/core/agent_interface/Cargo.toml
@@ -2,7 +2,8 @@
 name = "agent_interface"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 license = "Apache-2.0"
 description = "agent_interface defines all the mqtt topics and messages to be used to invoke the agent."
 
@@ -12,7 +13,7 @@ description = "agent_interface defines all the mqtt topics and messages to be us
 csv = "1.1"
 download = { path = "../../common/download" }
 nanoid = "0.4"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 thiserror = "1.0"
 
diff --git a/crates/core/c8y_smartrest/Cargo.toml b/crates/core/c8y_smartrest/Cargo.toml
index 90de89e2..4816796e 100644
--- a/crates/core/c8y_smartrest/Cargo.toml
+++ b/crates/core/c8y_smartrest/Cargo.toml
@@ -2,7 +2,8 @@
 name = "c8y_smartrest"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 [dependencies]
 agent_interface = { path = "../agent_interface" }
diff --git a/crates/core/c8y_translator/Cargo.toml b/crates/core/c8y_translator/Cargo.toml
index 9e9304fb..2e888668 100644
--- a/crates/core/c8y_translator/Cargo.toml
+++ b/crates/core/c8y_translator/Cargo.toml
@@ -2,7 +2,8 @@
 name = "c8y_translator"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 [dependencies]
 chrono = "0.4"
diff --git a/crates/core/c8y_translator/fuzz/Cargo.lock b/crates/core/c8y_translator/fuzz/Cargo.lock
new file mode 100644
index 00000000..3cd1c8b5
--- /dev/null
+++ b/crates/core/c8y_translator/fuzz/Cargo.lock
@@ -0,0 +1,426 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "arbitrary"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "510c76ecefdceada737ea728f4f9a84bd2e1ef29f1ba555e560940fe279954de"
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "c8y_translator"
+version = "0.5.1"
+dependencies = [
+ "chrono",
+ "clock",
+ "json-writer",
+ "thin_edge_json",
+ "thiserror",
+]
+
+[[package]]
+name = "c8y_translator-fuzz"
+version = "0.0.0"
+dependencies = [
+ "c8y_translator",
+ "libfuzzer-sys",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+dependencies = [
+ "libc",
+ "num-integer",
+ "num-traits",
+ "time 0.1.44",
+ "winapi",
+]
+
+[[package]]
+name = "clock"
+version = "0.5.1"
+dependencies = [
+ "chrono",
+ "mockall",
+ "serde",
+ "time 0.3.5",
+]
+
+[[package]]
+name = "difference"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+
+[[package]]
+name = "downcast"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d"
+
+[[package]]
+name = "float-cmp"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "fragile"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da1b8f89c5b5a5b7e59405cfcf0bb9588e5ed19f0b57a4cd542bbba3f164a6d"
+
+[[package]]
+name = "itoa"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+
+[[package]]
+name = "itoa"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+
+[[package]]
+name = "json-writer"
+version = "0.5.1"
+dependencies = [
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.112"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36a9a84a6e8b55dfefb04235e55edb2b9a2a18488fcae777a6bdaa6f06f1deb3"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
+
+[[package]]
+name = "memchr"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
+
+[[package]]
+name = "mockall"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ab571328afa78ae322493cacca3efac6a0f2e0a67305b4df31fd439ef129ac0"
+dependencies = [
+ "cfg-if",
+ "downcast",
+ "fragile",
+ "lazy_static",
+ "mockall_derive",
+ "predicates",
+ "predicates-tree",
+]
+
+[[package]]
+name = "mockall_derive"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7e25b214433f669161f414959594216d8e6ba83b6679d3db96899c0b4639033"
+dependencies = [
+ "cfg-if",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "normalize-line-endings"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
+
+[[package]]
+name = "num-integer"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
+
+[[package]]
+name = "predicates"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df"
+dependencies = [
+ "difference",
+ "float-cmp",
+ "normalize-line-endings",
+ "predicates-core",
+ "regex",
+]
+
+[[package]]
+name = "predicates-core"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb"
+
+[[package]]
+name = "predicates-tree"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032"
+dependencies = [
+ "predicates-core",
+ "termtree",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
+version = "1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+
+[[package]]
+name = "ryu"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+
+[[package]]
+name = "serde"
+version = "1.0.133"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.133"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c059c05b48c5c0067d4b4b2b4f0732dd65feb52daf7e0ea09cd87e7dadc1af79"
+dependencies = [
+ "itoa 1.0.1",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.85"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "termtree"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
+
+[[package]]
+name = "thin_edge_json"
+version = "0.5.1"
+dependencies = [
+ "chrono",
+ "clock",
+ "json-writer",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "time 0.3.5",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+dependencies = [
+ "libc",
+ "wasi",
+ "winapi",
+]
+
+[[package]]
+name = "time"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"
+dependencies = [
+ "itoa 0.4.8",
+ "libc",
+ "serde",
+ "time-macros",
+]
+
+[[package]]
+name = "time-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/crates/core/c8y_translator/fuzz/Cargo.toml b/crates/core/c8y_translator/fuzz/Cargo.toml
index 7744f66b..6b4becb9 100644
--- a/crates/core/c8y_translator/fuzz/Cargo.toml
+++ b/crates/core/c8y_translator/fuzz/Cargo.toml
@@ -4,7 +4,8 @@ name = "c8y_translator-fuzz"
 version = "0.0.0"
 authors = ["Automatically generated"]
 publish = false
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 [package.metadata]
 cargo-fuzz = true
diff --git a/crates/core/plugin_sm/Cargo.toml b/crates/core/plugin_sm/Cargo.toml
index 218fd464..7df8252c 100644
--- a/crates/core/plugin_sm/Cargo.toml
+++ b/crates/core/plugin_sm/Cargo.toml
@@ -2,7 +2,8 @@
 name = "plugin_sm"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 [dependencies]
 agent_interface = { path = "../agent_interface" }
diff --git a/crates/core/tedge/Cargo.toml b/crates/core/tedge/Cargo.toml
index cc2d972b..3af26f94 100644
--- a/crates/core/tedge/Cargo.toml
+++ b/crates/core/tedge/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
 name = "tedge"
 version = "0.5.2"
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/core/tedge_agent/Cargo.toml b/crates/core/tedge_agent/Cargo.toml
index 29dc9ba9..cabb916b 100644
--- a/crates/core/tedge_agent/Cargo.toml
+++ b/crates/core/tedge_agent/Cargo.toml
@@ -2,7 +2,8 @@
 name = "tedge_agent"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 license = "Apache-2.0"
 description = "tedge_agent interacts with a Cloud Mapper and one or more Software Plugins"
 
diff --git a/crates/core/tedge_mapper/Cargo.toml b/crates/core/tedge_mapper/Cargo.toml
index 7a54d06a..22319cb1 100644
--- a/crates/core/tedge_mapper/Cargo.toml
+++ b/crates/core/tedge_mapper/Cargo.toml
@@ -2,7 +2,8 @@
 name = "tedge_mapper"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 license = "Apache-2.0"
 description = "tedge_mapper is the mapper that translates thin-edge.io data model to c8y/az data model."
 
diff --git a/crates/core/thin_edge_json/Cargo.toml b/crates/core/thin_edge_json/Cargo.toml
index 95529f20..cc3f5342 100644
--- a/crates/core/thin_edge_json/Cargo.toml
+++ b/crates/core/thin_edge_json/Cargo.toml
@@ -2,7 +2,8 @@
 name = "thin_edge_json"
 version = "0.5.2"
 authors = ["thin-edge.io team <info@thin-edge.io>"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.58"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/crates/core/thin_edge_json/benches/parsing.rs b/crates/core/thin_edge_json/benches/parsing.rs
index 7b5a56ff..b4294cb6 100644
--- a/crates/core/thin_edge_json/benches/parsing.rs
+++ b/crates/core/thin_edge_json/benches/parsing.rs
@@ -41,7 +41,7 @@ impl MeasurementVisitor for DummyVisitor {
 }
 
 fn parse_stream(input: &str) {
-    thin_edge_json::stream::parse_str(input, &mut DummyVisitor).unwrap();
+    thin_edge_json::parser::parse_str(input, &mut DummyVisitor).unwrap();
 }
 
 fn criterion_benchmark(c: &mut Criterion) {
diff --git a/crates/tests/mqtt_tests/Cargo.toml b/crates/tests/mqtt_tests/Cargo.toml
index 936cf91c..ac834207 100644
--- a/crates/tests/mqtt_tests/Cargo.toml
+++ b/crates/tests/mqtt_tests/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
 name = "mqtt_tests"
+edition = "2021"
+rust-version = "1.58"
 version = "0.5.2"
-edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html