update to use rust 1.57.0 and edition2021 (#3114)

* update to use rust 1.57.0 * chore: fix clippy * fix clippy
starcoinorg · Dec 24, 2021 · a1766ad · a1766ad
1 parent f4baa90
commit a1766ad
Show file tree

Hide file tree

Showing 125 changed files with 147 additions and 168 deletions.
diff --git a/abi/decoder/Cargo.toml b/abi/decoder/Cargo.toml
@@ -3,7 +3,7 @@ name = "starcoin-abi-decoder"
 version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/abi/resolver/Cargo.toml b/abi/resolver/Cargo.toml
@@ -2,7 +2,7 @@
 name = "starcoin-abi-resolver"
 version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/abi/types/Cargo.toml b/abi/types/Cargo.toml
@@ -3,7 +3,7 @@ name = "starcoin-abi-types"
 version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/account/Cargo.toml b/account/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/account/api/Cargo.toml b/account/api/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/account/service/Cargo.toml b/account/service/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/block-relayer/Cargo.toml b/block-relayer/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/chain/Cargo.toml b/chain/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/chain/api/Cargo.toml b/chain/api/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/chain/chain-notify/Cargo.toml b/chain/chain-notify/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/chain/mock/Cargo.toml b/chain/mock/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/chain/open-block/Cargo.toml b/chain/open-block/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/chain/service/Cargo.toml b/chain/service/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/cmd/airdrop/Cargo.toml b/cmd/airdrop/Cargo.toml
@@ -2,7 +2,7 @@
 name = "airdrop"
 version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/cmd/db-exporter/Cargo.toml b/cmd/db-exporter/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/cmd/faucet/Cargo.toml b/cmd/faucet/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/cmd/generator/Cargo.toml b/cmd/generator/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/cmd/genesis-nft-miner/Cargo.toml b/cmd/genesis-nft-miner/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 starcoin-rpc-api = {path = "../../rpc/api" }

diff --git a/cmd/indexer/Cargo.toml b/cmd/indexer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["Starcoin Core Dev <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 name = "starcoin-indexer"
 publish = false

diff --git a/cmd/merkle-generator/Cargo.toml b/cmd/merkle-generator/Cargo.toml
@@ -2,7 +2,7 @@
 name = "merkle-generator"
 version = "1.9.0"
 authors = ["caojiafeng <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/cmd/miner_client/Cargo.toml b/cmd/miner_client/Cargo.toml
@@ -2,7 +2,7 @@
 name = "starcoin-miner-client"
 version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/cmd/miner_client/api/Cargo.toml b/cmd/miner_client/api/Cargo.toml
@@ -2,7 +2,7 @@
 name = "starcoin-miner-client-api"
 version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/cmd/miner_client/src/stratum_client.rs b/cmd/miner_client/src/stratum_client.rs
@@ -49,17 +49,18 @@ impl JobClient for StratumJobClient {
                         let blob = hex::decode(&job.blob);
                         let diff = target_hex_to_difficulty(&job.target);
                         let extra = job.get_extra();
-                        let event = if blob.is_ok() && diff.is_ok() && extra.is_ok() {
+                        let event = if let (Ok(blob), Ok(diff), Ok(extra)) = (blob, diff, extra) {
                             Some(MintBlockEvent {
                                 parent_hash: Default::default(),
                                 strategy: ConsensusStrategy::CryptoNight,
-                                minting_blob: blob.expect(""),
-                                difficulty: diff.expect(""),
+                                minting_blob: blob,
+                                difficulty: diff,
                                 block_number: job.height,
                                 extra: Some(MintEventExtra {
                                     worker_id: job.id,
                                     job_id: job.job_id,
-                                    extra: extra.expect(""),
+
+                                    extra,
                                 }),
                             })
                         } else {

diff --git a/cmd/miner_client/src/stratum_client_service.rs b/cmd/miner_client/src/stratum_client_service.rs
@@ -62,6 +62,7 @@ pub struct JobNotification {
 #[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
 #[serde(deny_unknown_fields)]
 #[serde(untagged)]
+#[allow(clippy::large_enum_variant)]
 pub enum OutputResponse {
     StratumJob(StratumJobResponse),
     Status(Status),

diff --git a/cmd/peer-watcher/Cargo.toml b/cmd/peer-watcher/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "starcoin_peer_watcher"

diff --git a/cmd/replay/Cargo.toml b/cmd/replay/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.8.0-rc.1"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "starcoin_replay"

diff --git a/cmd/resource-exporter/Cargo.toml b/cmd/resource-exporter/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/cmd/starcoin/Cargo.toml b/cmd/starcoin/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/cmd/tx-factory/Cargo.toml b/cmd/tx-factory/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [[bin]]
 name = "starcoin_txfactory"

diff --git a/commons/accumulator/Cargo.toml b/commons/accumulator/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 
 [dependencies]

diff --git a/commons/api-limiter/Cargo.toml b/commons/api-limiter/Cargo.toml
@@ -3,7 +3,7 @@ name = "api-limiter"
 version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/commons/api-limiter/src/lib.rs b/commons/api-limiter/src/lib.rs
@@ -17,8 +17,6 @@ pub struct ApiLimiter<User>
 where
     User: Clone + Hash + Eq,
 {
-    global_quota: Quota,
-    user_quota: Quota,
     global_limiter: DirectRateLimiter,
     user_limiter: KeyedRateLimiter<User>,
 }
@@ -31,8 +29,6 @@ where
         Self {
             global_limiter: DirectRateLimiter::direct(global_quota),
             user_limiter: KeyedRateLimiter::keyed(user_quota),
-            global_quota,
-            user_quota,
         }
     }
 

diff --git a/commons/bcs_ext/Cargo.toml b/commons/bcs_ext/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/commons/crypto/Cargo.toml b/commons/crypto/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 serde = { version = "1.0.130" }

diff --git a/commons/crypto/crypto-macro/Cargo.toml b/commons/crypto/crypto-macro/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [lib]
 proc-macro = true

diff --git a/commons/decrypt/Cargo.toml b/commons/decrypt/Cargo.toml
@@ -3,7 +3,7 @@ name = "starcoin-decrypt"
 version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 pbkdf2="0.3"

diff --git a/commons/forkable-jellyfish-merkle/Cargo.toml b/commons/forkable-jellyfish-merkle/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Diem Association <[email protected]>", "Starcoin Core Dev <dev@sta
 description = "Diem jellyfish merkle"
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/commons/logger/Cargo.toml b/commons/logger/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.41"

diff --git a/commons/metrics/Cargo.toml b/commons/metrics/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 description = "Starcoin metrics"
 
 [dependencies]

diff --git a/commons/metrics/src/op_counters.rs b/commons/metrics/src/op_counters.rs
@@ -38,6 +38,7 @@ impl DurationHistogram {
 
 #[derive(Clone)]
 pub struct OpMetrics {
+    #[allow(unused)]
     module: String,
     counters: IntCounterVec,
     gauges: IntGaugeVec,

diff --git a/commons/proptest-helpers/Cargo.toml b/commons/proptest-helpers/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.9.0"
 authors = ["Starcoin Core Dev <[email protected]>"]
 license = "Apache-2.0"
 publish = false
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 crossbeam = "0.7.3"