Upgrade rust 1.69.0 (#906)

* Upgrade rust-1.69 * fix clippy
open-web3-stack · Apr 26, 2023 · 8c036ba · 8c036ba
1 parent 19afb58
commit 8c036ba
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2022-10-30
+          toolchain: nightly-2023-03-04
           components: rustfmt
           target: wasm32-unknown-unknown
       - name: Generate code coverage

diff --git a/.github/workflows/master.yml.disabled b/.github/workflows/master.yml.disabled
@@ -15,7 +15,7 @@ jobs:
     - name: Install toolchain
       uses: dtolnay/rust-toolchain@nightly
       with:
-        toolchain: nightly-2022-10-30
+        toolchain: nightly-2023-03-04
     - name: Install cargo-unleash
       run: cargo install cargo-unleash --git https://github.com/xlc/cargo-unleash.git # https://github.com/paritytech/cargo-unleash/pull/38
     - name: Prepare

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Install toolchain
       uses: dtolnay/rust-toolchain@nightly
       with:
-        toolchain: nightly-2022-10-30
+        toolchain: nightly-2023-03-04
         components: rustfmt
         target: wasm32-unknown-unknown
     - name: Install Wasm toolchain

diff --git a/bencher/src/handler.rs b/bencher/src/handler.rs
@@ -32,7 +32,7 @@ pub fn handle(output: Vec<u8>, storage_infos: Vec<StorageInfo>) {
 			let name = String::from_utf8_lossy(&result.method).to_string();
 
 			let y: Vec<f64> = result.elapses.into_iter().map(|x| x as f64).collect();
-			let x: Vec<f64> = (0..y.len()).into_iter().map(|x| x as f64).collect();
+			let x: Vec<f64> = (0..y.len()).map(|x| x as f64).collect();
 			let data = vec![("Y", y), ("X", x)];
 			let data = RegressionDataBuilder::new().build_from(data).unwrap();
 			let formula = "Y ~ X";

diff --git a/bencher/src/tracker.rs b/bencher/src/tracker.rs
@@ -4,20 +4,15 @@ use sp_state_machine::StorageKey;
 use sp_storage::ChildInfo;
 use std::{collections::HashMap, sync::Arc, time::Instant};
 
-#[derive(PartialEq, Eq)]
+#[derive(PartialEq, Eq, Default)]
 enum AccessType {
+	#[default]
 	None,
 	Redundant,
 	Important,
 	Whitelisted,
 }
 
-impl Default for AccessType {
-	fn default() -> Self {
-		AccessType::None
-	}
-}
-
 impl AccessType {
 	fn is_important(&self) -> bool {
 		*self == AccessType::Important