From dafbf5c63683fae9618581dcb18b3fa52eae5957 Mon Sep 17 00:00:00 2001
From: Wei Tang <wei@that.world>
Date: Fri, 8 Apr 2022 02:04:47 +0200
Subject: [PATCH] Use namespaced dependency and weak feature declaration

---
 Cargo.toml           | 8 ++++----
 core/Cargo.toml      | 6 +++---
 gasometer/Cargo.toml | 4 ++--
 runtime/Cargo.toml   | 4 ++--
 rust-toolchain.toml  | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 83c004e12..f11e184ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,11 +33,11 @@ harness = false
 
 [features]
 default = ["std"]
-with-codec = ["codec", "scale-info", "evm-core/with-codec", "primitive-types/codec", "primitive-types/scale-info", "ethereum/with-codec"]
-with-serde = ["serde", "evm-core/with-serde", "primitive-types/serde", "ethereum/with-serde"]
-std = ["evm-core/std", "evm-gasometer/std", "evm-runtime/std", "sha3/std", "primitive-types/std", "serde/std", "codec/std", "log/std", "ethereum/std", "environmental/std", "scale-info/std"]
+with-codec = ["dep:codec", "dep:scale-info", "evm-core/with-codec", "primitive-types/codec", "primitive-types/scale-info", "ethereum/with-codec"]
+with-serde = ["dep:serde", "evm-core/with-serde", "primitive-types/serde", "ethereum/with-serde"]
+std = ["evm-core/std", "evm-gasometer/std", "evm-runtime/std", "sha3/std", "primitive-types/std", "serde?/std", "codec?/std", "log/std", "ethereum/std", "environmental?/std", "scale-info?/std"]
 tracing = [
-  "environmental",
+  "dep:environmental",
   "evm-gasometer/tracing",
   "evm-runtime/tracing"
 ]
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 2eed67694..6fcb9909f 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -19,6 +19,6 @@ hex = "0.4"
 
 [features]
 default = ["std"]
-with-codec = ["codec", "scale-info", "primitive-types/impl-codec"]
-with-serde = ["serde", "primitive-types/impl-serde"]
-std = ["primitive-types/std", "codec/std", "serde/std", "scale-info/std"]
+with-codec = ["dep:codec", "dep:scale-info", "primitive-types/impl-codec"]
+with-serde = ["dep:serde", "primitive-types/impl-serde"]
+std = ["primitive-types/std", "codec?/std", "serde?/std", "scale-info?/std"]
diff --git a/gasometer/Cargo.toml b/gasometer/Cargo.toml
index 133148e03..e9bb9b0a8 100644
--- a/gasometer/Cargo.toml
+++ b/gasometer/Cargo.toml
@@ -20,8 +20,8 @@ std = [
   "evm-core/std",
   "evm-runtime/std",
   "primitive-types/std",
-  "environmental/std"
+  "environmental?/std"
 ]
 tracing = [
-  "environmental"
+  "dep:environmental"
 ]
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 8214e4b6d..c4d4df731 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -17,7 +17,7 @@ auto_impl = "0.5.0"
 
 [features]
 default = ["std"]
-std = ["evm-core/std", "primitive-types/std", "sha3/std", "environmental/std"]
+std = ["evm-core/std", "primitive-types/std", "sha3/std", "environmental?/std"]
 tracing = [
-  "environmental"
+  "dep:environmental"
 ]
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index b06826a0f..18c1ae04e 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.58.1"
+channel = "1.60.0"
 profile = "minimal"
 components = [ "rustfmt", "clippy" ]