Rust edition 2021 (#132)

ascjones · web-flow · commit d13be2a64374 · 2021-10-22T12:43:27.000+01:00
* Rust edition 2021 * Make clippy happy * Revert "Make clippy happy" This reverts commit 031153d. * Clipppyyyyyyy
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -43,7 +43,7 @@ trailing_comma = "Vertical"
 match_block_trailing_comma = false
 blank_lines_upper_bound = 1
 blank_lines_lower_bound = 0
-edition = "2018" # changed
+edition = "2021" # changed
 version = "One"
 merge_derives = true
 use_try_shorthand = true # changed
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "scale-info"
 version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/derive/Cargo.toml b/derive/Cargo.toml
@@ -2,7 +2,7 @@
 name = "scale-info-derive"
 version = "1.0.0"
 authors = ["Parity Technologies <admin@parity.io>", "Centrality Developers <support@centrality.ai>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 repository = "https://github.com/paritytech/scale-info"
diff --git a/src/build.rs b/src/build.rs
@@ -340,7 +340,7 @@ pub struct FieldBuilder<
     marker: PhantomData<fn() -> (N, T)>,
 }
 
-impl Default for FieldBuilder {
+impl<N, T> Default for FieldBuilder<N, T> {
     fn default() -> Self {
         FieldBuilder {
             name: Default::default(),
diff --git a/test_suite/Cargo.toml b/test_suite/Cargo.toml
@@ -2,7 +2,7 @@
 name = "scale-info-test-suite"
 version = "0.0.0"
 authors = ["Parity Technologies <admin@parity.io>", "Centrality Developers <support@centrality.ai>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 license = "Apache-2.0"
diff --git a/test_suite/derive_tests_no_std/Cargo.toml b/test_suite/derive_tests_no_std/Cargo.toml
@@ -2,7 +2,7 @@
 name = "scale-info-derive-tests-no-std"
 version = "0.0.0"
 authors = ["Parity Technologies <admin@parity.io>", "Centrality Developers <support@centrality.ai>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 license = "Apache-2.0"

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ pub struct FieldBuilder<`
`340`	`340`	`marker: PhantomData<fn() -> (N, T)>,`
`341`	`341`	`}`
`342`	`342`
`343`		`-impl Default for FieldBuilder {`
	`343`	`+impl<N, T> Default for FieldBuilder<N, T> {`
`344`	`344`	`fn default() -> Self {`
`345`	`345`	`FieldBuilder {`
`346`	`346`	`name: Default::default(),`