diff --git a/clients/client-core/Cargo.toml b/clients/client-core/Cargo.toml index e8a4aa39e7..464bf9d0a4 100644 --- a/clients/client-core/Cargo.toml +++ b/clients/client-core/Cargo.toml @@ -2,7 +2,7 @@ name = "client-core" version = "0.12.0" authors = ["Dave Hrycyszyn "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index fcdde9ea1c..bbb1ba86db 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -2,7 +2,7 @@ name = "nym-client" version = "0.12.1" authors = ["Dave Hrycyszyn ", "Jędrzej Stuczyński "] -edition = "2018" +edition = "2021" rust-version = "1.56" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/clients/native/websocket-requests/Cargo.toml b/clients/native/websocket-requests/Cargo.toml index bd97d7fad6..74bb1ee500 100644 --- a/clients/native/websocket-requests/Cargo.toml +++ b/clients/native/websocket-requests/Cargo.toml @@ -2,7 +2,7 @@ name = "websocket-requests" version = "0.1.0" authors = ["Jędrzej Stuczyński "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml index c256c005a0..b5116794ff 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -2,7 +2,7 @@ name = "nym-socks5-client" version = "0.12.1" authors = ["Dave Hrycyszyn "] -edition = "2018" +edition = "2021" rust-version = "1.56" [lib] diff --git a/clients/tauri-client/src-tauri/Cargo.toml b/clients/tauri-client/src-tauri/Cargo.toml index c39fd4e600..075ec15f4d 100644 --- a/clients/tauri-client/src-tauri/Cargo.toml +++ b/clients/tauri-client/src-tauri/Cargo.toml @@ -6,7 +6,7 @@ authors = ["you"] license = "" repository = "" default-run = "app" -edition = "2018" +edition = "2021" build = "src/build.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/clients/webassembly/Cargo.toml b/clients/webassembly/Cargo.toml index a04d136465..72321e98e3 100644 --- a/clients/webassembly/Cargo.toml +++ b/clients/webassembly/Cargo.toml @@ -2,7 +2,7 @@ name = "nym-client-wasm" authors = ["Dave Hrycyszyn ", "Jedrzej Stuczynski "] version = "0.12.0" -edition = "2018" +edition = "2021" keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy", "client"] license = "Apache-2.0" repository = "https://github.com/nymtech/nym" diff --git a/common/bandwidth-claim-contract/Cargo.toml b/common/bandwidth-claim-contract/Cargo.toml index 6366405f6a..e63e100d7a 100644 --- a/common/bandwidth-claim-contract/Cargo.toml +++ b/common/bandwidth-claim-contract/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bandwidth-claim-contract" version = "0.1.0" -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/client-libs/gateway-client/Cargo.toml b/common/client-libs/gateway-client/Cargo.toml index c7a04fd23e..5f0b0730c2 100644 --- a/common/client-libs/gateway-client/Cargo.toml +++ b/common/client-libs/gateway-client/Cargo.toml @@ -2,7 +2,7 @@ name = "gateway-client" version = "0.1.0" authors = ["Jędrzej Stuczyński "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/client-libs/mixnet-client/Cargo.toml b/common/client-libs/mixnet-client/Cargo.toml index 1d32991f1f..2585440542 100644 --- a/common/client-libs/mixnet-client/Cargo.toml +++ b/common/client-libs/mixnet-client/Cargo.toml @@ -2,7 +2,7 @@ name = "mixnet-client" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/client-libs/validator-client/Cargo.toml b/common/client-libs/validator-client/Cargo.toml index 826366256d..30da196e37 100644 --- a/common/client-libs/validator-client/Cargo.toml +++ b/common/client-libs/validator-client/Cargo.toml @@ -2,7 +2,7 @@ name = "validator-client" version = "0.1.0" authors = ["Jędrzej Stuczyński "] -edition = "2018" +edition = "2021" rust-version = "1.56" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/coconut-interface/Cargo.toml b/common/coconut-interface/Cargo.toml index 9061280c79..d2c891845d 100644 --- a/common/coconut-interface/Cargo.toml +++ b/common/coconut-interface/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "coconut-interface" version = "0.1.0" -edition = "2018" +edition = "2021" description = "Crutch library until there is proper SerDe support for coconut structs" [dependencies] diff --git a/common/config/Cargo.toml b/common/config/Cargo.toml index 7a18a25cd8..2455b32f8a 100644 --- a/common/config/Cargo.toml +++ b/common/config/Cargo.toml @@ -2,7 +2,7 @@ name = "config" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml index 9b8efe8bc8..248036d804 100644 --- a/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml +++ b/common/cosmwasm-smart-contracts/mixnet-contract/Cargo.toml @@ -2,7 +2,7 @@ name = "mixnet-contract-common" version = "0.1.0" authors = ["Jędrzej Stuczyński "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/credentials/Cargo.toml b/common/credentials/Cargo.toml index 8536669e00..bbfe5a1c4e 100644 --- a/common/credentials/Cargo.toml +++ b/common/credentials/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "credentials" version = "0.1.0" -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/crypto/Cargo.toml b/common/crypto/Cargo.toml index f55a364a68..a638b089dc 100644 --- a/common/crypto/Cargo.toml +++ b/common/crypto/Cargo.toml @@ -2,7 +2,7 @@ name = "crypto" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/network-defaults/Cargo.toml b/common/network-defaults/Cargo.toml index 1c9f09f349..ec1ee84178 100644 --- a/common/network-defaults/Cargo.toml +++ b/common/network-defaults/Cargo.toml @@ -2,7 +2,7 @@ name = "network-defaults" version = "0.1.0" authors = ["Jędrzej Stuczyński "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nonexhaustive-delayqueue/Cargo.toml b/common/nonexhaustive-delayqueue/Cargo.toml index 7dfd0318d2..ea64ddf6c6 100644 --- a/common/nonexhaustive-delayqueue/Cargo.toml +++ b/common/nonexhaustive-delayqueue/Cargo.toml @@ -2,7 +2,7 @@ name = "nonexhaustive-delayqueue" version = "0.1.0" authors = ["Jędrzej Stuczyński "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nymcoconut/Cargo.toml b/common/nymcoconut/Cargo.toml index db1c3dc236..bc15c04621 100644 --- a/common/nymcoconut/Cargo.toml +++ b/common/nymcoconut/Cargo.toml @@ -2,7 +2,7 @@ name = "nymcoconut" version = "0.5.0" authors = ["Jedrzej Stuczynski ", "Ania Piotrowska "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nymsphinx/Cargo.toml b/common/nymsphinx/Cargo.toml index ce94c101b0..460fd11390 100644 --- a/common/nymsphinx/Cargo.toml +++ b/common/nymsphinx/Cargo.toml @@ -2,7 +2,7 @@ name = "nymsphinx" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nymsphinx/acknowledgements/Cargo.toml b/common/nymsphinx/acknowledgements/Cargo.toml index 3e6f725490..fa706ec804 100644 --- a/common/nymsphinx/acknowledgements/Cargo.toml +++ b/common/nymsphinx/acknowledgements/Cargo.toml @@ -2,7 +2,7 @@ name = "nymsphinx-acknowledgements" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nymsphinx/addressing/Cargo.toml b/common/nymsphinx/addressing/Cargo.toml index b1c04c452b..f65c011e16 100644 --- a/common/nymsphinx/addressing/Cargo.toml +++ b/common/nymsphinx/addressing/Cargo.toml @@ -2,7 +2,7 @@ name = "nymsphinx-addressing" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nymsphinx/anonymous-replies/Cargo.toml b/common/nymsphinx/anonymous-replies/Cargo.toml index be41fef7f2..246f6de509 100644 --- a/common/nymsphinx/anonymous-replies/Cargo.toml +++ b/common/nymsphinx/anonymous-replies/Cargo.toml @@ -2,7 +2,7 @@ name = "nymsphinx-anonymous-replies" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nymsphinx/chunking/Cargo.toml b/common/nymsphinx/chunking/Cargo.toml index 0b7d19050d..5f47ab5358 100644 --- a/common/nymsphinx/chunking/Cargo.toml +++ b/common/nymsphinx/chunking/Cargo.toml @@ -2,7 +2,7 @@ name = "nymsphinx-chunking" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nymsphinx/cover/Cargo.toml b/common/nymsphinx/cover/Cargo.toml index 49d58431c6..bb58af09b7 100644 --- a/common/nymsphinx/cover/Cargo.toml +++ b/common/nymsphinx/cover/Cargo.toml @@ -2,7 +2,7 @@ name = "nymsphinx-cover" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nymsphinx/forwarding/Cargo.toml b/common/nymsphinx/forwarding/Cargo.toml index 80ab053665..6b29d9f9e5 100644 --- a/common/nymsphinx/forwarding/Cargo.toml +++ b/common/nymsphinx/forwarding/Cargo.toml @@ -2,7 +2,7 @@ name = "nymsphinx-forwarding" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nymsphinx/framing/Cargo.toml b/common/nymsphinx/framing/Cargo.toml index 7e73173606..0cddb5bf22 100644 --- a/common/nymsphinx/framing/Cargo.toml +++ b/common/nymsphinx/framing/Cargo.toml @@ -2,7 +2,7 @@ name = "nymsphinx-framing" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nymsphinx/params/Cargo.toml b/common/nymsphinx/params/Cargo.toml index 3e5fbf56b3..409dc38d58 100644 --- a/common/nymsphinx/params/Cargo.toml +++ b/common/nymsphinx/params/Cargo.toml @@ -2,7 +2,7 @@ name = "nymsphinx-params" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/nymsphinx/types/Cargo.toml b/common/nymsphinx/types/Cargo.toml index 4eca2b7df7..34a916bbf5 100644 --- a/common/nymsphinx/types/Cargo.toml +++ b/common/nymsphinx/types/Cargo.toml @@ -2,7 +2,7 @@ name = "nymsphinx-types" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/pemstore/Cargo.toml b/common/pemstore/Cargo.toml index 9c5b4f5c1e..db4b331327 100644 --- a/common/pemstore/Cargo.toml +++ b/common/pemstore/Cargo.toml @@ -2,7 +2,7 @@ name = "pemstore" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/socks5/ordered-buffer/Cargo.toml b/common/socks5/ordered-buffer/Cargo.toml index 1a47058ef5..f5ea5545d8 100644 --- a/common/socks5/ordered-buffer/Cargo.toml +++ b/common/socks5/ordered-buffer/Cargo.toml @@ -2,7 +2,7 @@ name = "ordered-buffer" version = "0.1.0" authors = ["Dave Hrycyszyn "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/socks5/proxy-helpers/Cargo.toml b/common/socks5/proxy-helpers/Cargo.toml index 9d9b42d627..e3e6470a03 100644 --- a/common/socks5/proxy-helpers/Cargo.toml +++ b/common/socks5/proxy-helpers/Cargo.toml @@ -2,7 +2,7 @@ name = "proxy-helpers" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/socks5/requests/Cargo.toml b/common/socks5/requests/Cargo.toml index 2a900389ca..39ccacb4b1 100644 --- a/common/socks5/requests/Cargo.toml +++ b/common/socks5/requests/Cargo.toml @@ -2,7 +2,7 @@ name = "socks5-requests" version = "0.1.0" authors = ["Dave Hrycyszyn "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/topology/Cargo.toml b/common/topology/Cargo.toml index 7d7bb7ecc3..f2a8a899fd 100644 --- a/common/topology/Cargo.toml +++ b/common/topology/Cargo.toml @@ -2,7 +2,7 @@ name = "topology" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/version-checker/Cargo.toml b/common/version-checker/Cargo.toml index 6cc9b02bb8..e6ccdbf241 100644 --- a/common/version-checker/Cargo.toml +++ b/common/version-checker/Cargo.toml @@ -2,7 +2,7 @@ name = "version-checker" version = "0.1.0" authors = ["Dave Hrycyszyn "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/common/wasm-utils/Cargo.toml b/common/wasm-utils/Cargo.toml index 6c66f52bf3..30f61734b2 100644 --- a/common/wasm-utils/Cargo.toml +++ b/common/wasm-utils/Cargo.toml @@ -2,7 +2,7 @@ name = "wasm-utils" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/contracts/bandwidth-claim/Cargo.toml b/contracts/bandwidth-claim/Cargo.toml index 3480a608f1..390baf1ab7 100644 --- a/contracts/bandwidth-claim/Cargo.toml +++ b/contracts/bandwidth-claim/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bandwidth-claim" version = "0.1.0" -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/contracts/mixnet/Cargo.toml b/contracts/mixnet/Cargo.toml index e1e111c1e8..e57152339f 100644 --- a/contracts/mixnet/Cargo.toml +++ b/contracts/mixnet/Cargo.toml @@ -2,7 +2,7 @@ name = "mixnet-contract" version = "0.1.0" authors = ["Dave Hrycyszyn "] -edition = "2018" +edition = "2021" exclude = [ # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication. diff --git a/contracts/vesting/Cargo.toml b/contracts/vesting/Cargo.toml index 01e1a37b7d..00d21fd8b6 100644 --- a/contracts/vesting/Cargo.toml +++ b/contracts/vesting/Cargo.toml @@ -2,7 +2,7 @@ name = "vesting-contract" version = "0.1.0" authors = ["Drazen Urch "] -edition = "2018" +edition = "2021" exclude = [ # Those files are rust-optimizer artifacts. You might want to commit them for convenience but they should not be part of the source code publication. diff --git a/explorer-api/Cargo.toml b/explorer-api/Cargo.toml index 24a9357530..f0084b203d 100644 --- a/explorer-api/Cargo.toml +++ b/explorer-api/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "explorer-api" version = "0.1.0" -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index 19aca0a7b9..429ade551f 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -5,7 +5,7 @@ name = "nym-gateway" version = "0.12.1" authors = ["Dave Hrycyszyn ", "Jędrzej Stuczyński "] -edition = "2018" +edition = "2021" rust-version = "1.56" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/gateway/gateway-requests/Cargo.toml b/gateway/gateway-requests/Cargo.toml index de5bf95356..a835554d9b 100644 --- a/gateway/gateway-requests/Cargo.toml +++ b/gateway/gateway-requests/Cargo.toml @@ -5,7 +5,7 @@ name = "gateway-requests" version = "0.1.0" authors = ["Jedrzej Stuczynski "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/mixnode/Cargo.toml b/mixnode/Cargo.toml index fcc3531e27..c170625ec5 100644 --- a/mixnode/Cargo.toml +++ b/mixnode/Cargo.toml @@ -10,7 +10,7 @@ authors = [ "Drazen Urch ", ] description = "Implementation of a Loopix-based Mixnode" -edition = "2018" +edition = "2021" rust-version = "1.58.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/nym-wallet/src-tauri/Cargo.toml b/nym-wallet/src-tauri/Cargo.toml index 7647fc3c2d..54e43f7470 100644 --- a/nym-wallet/src-tauri/Cargo.toml +++ b/nym-wallet/src-tauri/Cargo.toml @@ -6,7 +6,7 @@ authors = ["you"] license = "" repository = "" default-run = "nym_wallet" -edition = "2018" +edition = "2021" build = "src/build.rs" rust-version = "1.56" diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index 9bd8caa48f..914c97812a 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -5,7 +5,7 @@ name = "nym-network-requester" version = "0.12.0" authors = ["Dave Hrycyszyn ", "Jędrzej Stuczyński "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/validator-api/Cargo.toml b/validator-api/Cargo.toml index 1d818518ea..ad55ccfc28 100644 --- a/validator-api/Cargo.toml +++ b/validator-api/Cargo.toml @@ -9,7 +9,7 @@ authors = [ "Jędrzej Stuczyński ", "Drazen Urch ", ] -edition = "2018" +edition = "2021" rust-version = "1.56" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/validator-api/src/network_monitor/test_route/mod.rs b/validator-api/src/network_monitor/test_route/mod.rs index c947f8e001..2471ef6813 100644 --- a/validator-api/src/network_monitor/test_route/mod.rs +++ b/validator-api/src/network_monitor/test_route/mod.rs @@ -23,13 +23,12 @@ impl TestRoute { l3_mix: mix::Node, gateway: gateway::Node, ) -> Self { - // When somebody gets to refactor this in the future and Rust 2021 is being used, - // the call could be changed to a simple `.into_iter()` - let layered_mixes = IntoIterator::into_iter([ + let layered_mixes = [ (1u8, vec![l1_mix]), (2u8, vec![l2_mix]), (3u8, vec![l3_mix]), - ]) + ] + .into_iter() .collect(); TestRoute {