Run cargo fmt on the whole code base (#9394)

* Run cargo fmt on the whole code base

* Second run

* Add CI check

* Fix compilation

* More unnecessary braces

* Handle weights

* Use --all

* Use correct attributes...

* Fix UI tests

* AHHHHHHHHH

* 🤦

* Docs

* Fix compilation

* 🤷

* Please stop

* 🤦 x 2

* More

* make rustfmt.toml consistent with polkadot

Co-authored-by: André Silva <andrerfosilva@gmail.com>
This commit is contained in:
Bastian Köcher
2021-07-21 16:32:32 +02:00
committed by GitHub
parent d451c38c1c
commit 7b56ab15b4
1010 changed files with 53339 additions and 51208 deletions
@@ -19,7 +19,7 @@
//! RuntimeDebugNoBound
use frame_support::{
DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound, DefaultNoBound,
CloneNoBound, DebugNoBound, DefaultNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound,
};
#[derive(RuntimeDebugNoBound)]
@@ -59,7 +59,7 @@ fn test_struct_named() {
phantom: Default::default(),
};
let a_default: StructNamed::<Runtime, ImplNone, ImplNone> = Default::default();
let a_default: StructNamed<Runtime, ImplNone, ImplNone> = Default::default();
assert_eq!(a_default.a, 0);
assert_eq!(a_default.b, 0);
assert_eq!(a_default.c, 0);
@@ -90,14 +90,9 @@ struct StructUnnamed<T: Config, U, V>(u32, u64, T::C, core::marker::PhantomData<
#[test]
fn test_struct_unnamed() {
let a_1 = StructUnnamed::<Runtime, ImplNone, ImplNone>(
1,
2,
3,
Default::default(),
);
let a_1 = StructUnnamed::<Runtime, ImplNone, ImplNone>(1, 2, 3, Default::default());
let a_default: StructUnnamed::<Runtime, ImplNone, ImplNone> = Default::default();
let a_default: StructUnnamed<Runtime, ImplNone, ImplNone> = Default::default();
assert_eq!(a_default.0, 0);
assert_eq!(a_default.1, 0);
assert_eq!(a_default.2, 0);
@@ -108,17 +103,9 @@ fn test_struct_unnamed() {
assert_eq!(a_2.1, 2);
assert_eq!(a_2.2, 3);
assert_eq!(a_2, a_1);
assert_eq!(
format!("{:?}", a_1),
String::from("StructUnnamed(1, 2, 3, PhantomData)")
);
assert_eq!(format!("{:?}", a_1), String::from("StructUnnamed(1, 2, 3, PhantomData)"));
let b = StructUnnamed::<Runtime, ImplNone, ImplNone>(
1,
2,
4,
Default::default(),
);
let b = StructUnnamed::<Runtime, ImplNone, ImplNone>(1, 2, 4, Default::default());
assert!(b != a_1);
}
@@ -126,12 +113,7 @@ fn test_struct_unnamed() {
#[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
enum Enum<T: Config, U, V> {
VariantUnnamed(u32, u64, T::C, core::marker::PhantomData<(U, V)>),
VariantNamed {
a: u32,
b: u64,
c: T::C,
phantom: core::marker::PhantomData<(U, V)>,
},
VariantNamed { a: u32, b: u64, c: T::C, phantom: core::marker::PhantomData<(U, V)> },
VariantUnit,
VariantUnit2,
}
@@ -139,11 +121,7 @@ enum Enum<T: Config, U, V> {
// enum that will have a named default.
#[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
enum Enum2<T: Config> {
VariantNamed {
a: u32,
b: u64,
c: T::C,
},
VariantNamed { a: u32, b: u64, c: T::C },
VariantUnnamed(u32, u64, T::C),
VariantUnit,
VariantUnit2,
@@ -153,18 +131,14 @@ enum Enum2<T: Config> {
#[derive(DebugNoBound, CloneNoBound, EqNoBound, PartialEqNoBound, DefaultNoBound)]
enum Enum3<T: Config> {
VariantUnit,
VariantNamed {
a: u32,
b: u64,
c: T::C,
},
VariantNamed { a: u32, b: u64, c: T::C },
VariantUnnamed(u32, u64, T::C),
VariantUnit2,
}
#[test]
fn test_enum() {
type TestEnum = Enum::<Runtime, ImplNone, ImplNone>;
type TestEnum = Enum<Runtime, ImplNone, ImplNone>;
let variant_0 = TestEnum::VariantUnnamed(1, 2, 3, Default::default());
let variant_0_bis = TestEnum::VariantUnnamed(1, 2, 4, Default::default());
let variant_1 = TestEnum::VariantNamed { a: 1, b: 2, c: 3, phantom: Default::default() };
@@ -179,14 +153,8 @@ fn test_enum() {
TestEnum::VariantUnnamed(0, 0, 0, Default::default())
);
assert_eq!(
Enum2::<Runtime>::default(),
Enum2::<Runtime>::VariantNamed { a: 0, b: 0, c: 0},
);
assert_eq!(
Enum3::<Runtime>::default(),
Enum3::<Runtime>::VariantUnit,
);
assert_eq!(Enum2::<Runtime>::default(), Enum2::<Runtime>::VariantNamed { a: 0, b: 0, c: 0 },);
assert_eq!(Enum3::<Runtime>::default(), Enum3::<Runtime>::VariantUnit,);
assert!(variant_0 != variant_0_bis);
assert!(variant_1 != variant_1_bis);
@@ -216,12 +184,6 @@ fn test_enum() {
format!("{:?}", variant_1),
String::from("Enum::VariantNamed { a: 1, b: 2, c: 3, phantom: PhantomData }"),
);
assert_eq!(
format!("{:?}", variant_2),
String::from("Enum::VariantUnit"),
);
assert_eq!(
format!("{:?}", variant_3),
String::from("Enum::VariantUnit2"),
);
assert_eq!(format!("{:?}", variant_2), String::from("Enum::VariantUnit"),);
assert_eq!(format!("{:?}", variant_3), String::from("Enum::VariantUnit2"),);
}