Format with rustfmt 0.4.2
diff --git a/tests/test_derive_input.rs b/tests/test_derive_input.rs
index 7057996..553871b 100644
--- a/tests/test_derive_input.rs
+++ b/tests/test_derive_input.rs
@@ -71,18 +71,17 @@
vis: Visibility::Public(VisPublic {
pub_token: Default::default(),
}),
- attrs: vec![
- Attribute {
- bracket_token: Default::default(),
- pound_token: Default::default(),
- style: AttrStyle::Outer,
- path: "derive".into(),
- tts: TokenStream::from_iter(vec![
- delimited(Parenthesis, vec![word("Debug"), op(','), word("Clone")]),
- ]),
- is_sugared_doc: false,
- },
- ],
+ attrs: vec![Attribute {
+ bracket_token: Default::default(),
+ pound_token: Default::default(),
+ style: AttrStyle::Outer,
+ path: "derive".into(),
+ tts: TokenStream::from_iter(vec![delimited(
+ Parenthesis,
+ vec![word("Debug"), op(','), word("Clone")],
+ )]),
+ is_sugared_doc: false,
+ }],
generics: Generics::default(),
data: Data::Struct(DataStruct {
semi_token: None,
@@ -113,24 +112,22 @@
qself: None,
path: Path {
leading_colon: None,
- segments: punctuated![
- PathSegment {
- ident: "Vec".into(),
- arguments: PathArguments::AngleBracketed(
- AngleBracketedGenericArguments {
- colon2_token: None,
- lt_token: Default::default(),
- args: punctuated![
- GenericArgument::Type(Type::from(TypePath {
- qself: None,
- path: "Attribute".into(),
- })),
- ],
- gt_token: Default::default(),
- },
- ),
- },
- ],
+ segments: punctuated![PathSegment {
+ ident: "Vec".into(),
+ arguments: PathArguments::AngleBracketed(
+ AngleBracketedGenericArguments {
+ colon2_token: None,
+ lt_token: Default::default(),
+ args: punctuated![GenericArgument::Type(Type::from(
+ TypePath {
+ qself: None,
+ path: "Attribute".into(),
+ }
+ )),],
+ gt_token: Default::default(),
+ },
+ ),
+ },],
},
}.into(),
},
@@ -233,18 +230,16 @@
attrs: Vec::new(),
fields: Fields::Unnamed(FieldsUnnamed {
paren_token: Default::default(),
- unnamed: punctuated![
- Field {
- colon_token: None,
- ident: None,
- vis: Visibility::Inherited,
- attrs: Vec::new(),
- ty: TypePath {
- qself: None,
- path: "T".into(),
- }.into(),
- },
- ],
+ unnamed: punctuated![Field {
+ colon_token: None,
+ ident: None,
+ vis: Visibility::Inherited,
+ attrs: Vec::new(),
+ ty: TypePath {
+ qself: None,
+ path: "T".into(),
+ }.into(),
+ },],
}),
discriminant: None,
},
@@ -253,18 +248,16 @@
attrs: Vec::new(),
fields: Fields::Unnamed(FieldsUnnamed {
paren_token: Default::default(),
- unnamed: punctuated![
- Field {
- ident: None,
- colon_token: None,
- vis: Visibility::Inherited,
- attrs: Vec::new(),
- ty: TypePath {
- qself: None,
- path: "E".into(),
- }.into(),
- },
- ],
+ unnamed: punctuated![Field {
+ ident: None,
+ colon_token: None,
+ vis: Visibility::Inherited,
+ attrs: Vec::new(),
+ ty: TypePath {
+ qself: None,
+ path: "E".into(),
+ }.into(),
+ },],
}),
discriminant: None,
},
@@ -356,43 +349,41 @@
let expected = DeriveInput {
ident: "Dummy".into(),
vis: Visibility::Inherited,
- attrs: vec![
- Attribute {
- bracket_token: Default::default(),
- pound_token: Default::default(),
- style: AttrStyle::Outer,
- path: Path {
- leading_colon: Some(Default::default()),
- segments: punctuated![
- PathSegment::from("attr_args"),
- PathSegment::from("identity"),
- ],
- },
- tts: TokenStream::from_iter(vec![
- word("fn"),
- word("main"),
- delimited(Parenthesis, vec![]),
- delimited(
- Brace,
- vec![
- word("assert_eq"),
- op('!'),
- delimited(
- Parenthesis,
- vec![
- word("foo"),
- delimited(Parenthesis, vec![]),
- op(','),
- lit(Literal::string("Hello, world!")),
- ],
- ),
- op(';'),
- ],
- ),
- ]),
- is_sugared_doc: false,
+ attrs: vec![Attribute {
+ bracket_token: Default::default(),
+ pound_token: Default::default(),
+ style: AttrStyle::Outer,
+ path: Path {
+ leading_colon: Some(Default::default()),
+ segments: punctuated![
+ PathSegment::from("attr_args"),
+ PathSegment::from("identity"),
+ ],
},
- ],
+ tts: TokenStream::from_iter(vec![
+ word("fn"),
+ word("main"),
+ delimited(Parenthesis, vec![]),
+ delimited(
+ Brace,
+ vec![
+ word("assert_eq"),
+ op('!'),
+ delimited(
+ Parenthesis,
+ vec![
+ word("foo"),
+ delimited(Parenthesis, vec![]),
+ op(','),
+ lit(Literal::string("Hello, world!")),
+ ],
+ ),
+ op(';'),
+ ],
+ ),
+ ]),
+ is_sugared_doc: false,
+ }],
generics: Generics::default(),
data: Data::Struct(DataStruct {
fields: Fields::Unit,
@@ -418,19 +409,17 @@
let expected = DeriveInput {
ident: "S".into(),
vis: Visibility::Inherited,
- attrs: vec![
- Attribute {
- bracket_token: Default::default(),
- pound_token: Default::default(),
- style: AttrStyle::Outer,
- path: Path {
- leading_colon: None,
- segments: punctuated![PathSegment::from("inert")],
- },
- tts: TokenStream::from_iter(vec![op('<'), word("T"), op('>')]),
- is_sugared_doc: false,
+ attrs: vec![Attribute {
+ bracket_token: Default::default(),
+ pound_token: Default::default(),
+ style: AttrStyle::Outer,
+ path: Path {
+ leading_colon: None,
+ segments: punctuated![PathSegment::from("inert")],
},
- ],
+ tts: TokenStream::from_iter(vec![op('<'), word("T"), op('>')]),
+ is_sugared_doc: false,
+ }],
generics: Generics::default(),
data: Data::Struct(DataStruct {
fields: Fields::Unit,
@@ -456,19 +445,17 @@
let expected = DeriveInput {
ident: "S".into(),
vis: Visibility::Inherited,
- attrs: vec![
- Attribute {
- bracket_token: Default::default(),
- pound_token: Default::default(),
- style: AttrStyle::Outer,
- path: Path {
- leading_colon: None,
- segments: punctuated![PathSegment::from("foo"), PathSegment::from("self")],
- },
- tts: TokenStream::empty(),
- is_sugared_doc: false,
+ attrs: vec![Attribute {
+ bracket_token: Default::default(),
+ pound_token: Default::default(),
+ style: AttrStyle::Outer,
+ path: Path {
+ leading_colon: None,
+ segments: punctuated![PathSegment::from("foo"), PathSegment::from("self")],
},
- ],
+ tts: TokenStream::empty(),
+ is_sugared_doc: false,
+ }],
generics: Generics::default(),
data: Data::Struct(DataStruct {
fields: Fields::Unit,
@@ -504,29 +491,24 @@
data: Data::Struct(DataStruct {
fields: Fields::Unnamed(FieldsUnnamed {
paren_token: Default::default(),
- unnamed: punctuated![
- Field {
- ident: None,
- vis: Visibility::Restricted(VisRestricted {
- path: Box::new(Path {
- leading_colon: None,
- segments: punctuated![
- PathSegment::from("m"),
- PathSegment::from("n")
- ],
- }),
- in_token: Some(Default::default()),
- paren_token: Default::default(),
- pub_token: Default::default(),
+ unnamed: punctuated![Field {
+ ident: None,
+ vis: Visibility::Restricted(VisRestricted {
+ path: Box::new(Path {
+ leading_colon: None,
+ segments: punctuated![PathSegment::from("m"), PathSegment::from("n")],
}),
- colon_token: None,
- attrs: vec![],
- ty: TypePath {
- qself: None,
- path: "u8".into(),
- }.into(),
- },
- ],
+ in_token: Some(Default::default()),
+ paren_token: Default::default(),
+ pub_token: Default::default(),
+ }),
+ colon_token: None,
+ attrs: vec![],
+ ty: TypePath {
+ qself: None,
+ path: "u8".into(),
+ }.into(),
+ },],
}),
semi_token: Some(Default::default()),
struct_token: Default::default(),
diff --git a/tests/test_generics.rs b/tests/test_generics.rs
index d4ca16f..bdeb171 100644
--- a/tests/test_generics.rs
+++ b/tests/test_generics.rs
@@ -43,20 +43,19 @@
colon_token: Some(token::Colon::default()),
}),
GenericParam::Type(TypeParam {
- attrs: vec![
- Attribute {
- bracket_token: Default::default(),
- pound_token: Default::default(),
- style: AttrStyle::Outer,
- path: "may_dangle".into(),
- tts: TokenStream::empty(),
- is_sugared_doc: false,
- },
- ],
+ attrs: vec![Attribute {
+ bracket_token: Default::default(),
+ pound_token: Default::default(),
+ style: AttrStyle::Outer,
+ path: "may_dangle".into(),
+ tts: TokenStream::empty(),
+ is_sugared_doc: false,
+ }],
ident: "T".into(),
- bounds: punctuated![
- TypeParamBound::Lifetime(Lifetime::new("'a", Span::call_site())),
- ],
+ bounds: punctuated![TypeParamBound::Lifetime(Lifetime::new(
+ "'a",
+ Span::call_site()
+ )),],
default: Some(
TypeTuple {
elems: Default::default(),
@@ -69,24 +68,20 @@
],
where_clause: Some(WhereClause {
where_token: Default::default(),
- predicates: punctuated![
- WherePredicate::Type(PredicateType {
+ predicates: punctuated![WherePredicate::Type(PredicateType {
+ lifetimes: None,
+ colon_token: Default::default(),
+ bounded_ty: TypePath {
+ qself: None,
+ path: "T".into(),
+ }.into(),
+ bounds: punctuated![TypeParamBound::Trait(TraitBound {
+ paren_token: None,
+ modifier: TraitBoundModifier::None,
lifetimes: None,
- colon_token: Default::default(),
- bounded_ty: TypePath {
- qself: None,
- path: "T".into(),
- }.into(),
- bounds: punctuated![
- TypeParamBound::Trait(TraitBound {
- paren_token: None,
- modifier: TraitBoundModifier::None,
- lifetimes: None,
- path: "Debug".into(),
- }),
- ],
- }),
- ],
+ path: "Debug".into(),
+ }),],
+ }),],
}),
};
diff --git a/tests/test_ident.rs b/tests/test_ident.rs
index 44cd86e..7a88f53 100644
--- a/tests/test_ident.rs
+++ b/tests/test_ident.rs
@@ -11,8 +11,8 @@
use proc_macro2::{Span, TokenStream};
use std::str::FromStr;
-use syn::Ident;
use syn::synom::ParseError;
+use syn::Ident;
fn parse(s: &str) -> Result<Ident, ParseError> {
syn::parse2(TokenStream::from_str(s).unwrap())
diff --git a/tests/test_meta_item.rs b/tests/test_meta_item.rs
index 22a38fb..55eefb8 100644
--- a/tests/test_meta_item.rs
+++ b/tests/test_meta_item.rs
@@ -96,15 +96,13 @@
MetaList {
ident: "foo".into(),
paren_token: Default::default(),
- nested: punctuated![
- NestedMeta::Meta(
- MetaNameValue {
- ident: "bar".into(),
- eq_token: Default::default(),
- lit: lit(Literal::i32_unsuffixed(5)),
- }.into(),
- ),
- ],
+ nested: punctuated![NestedMeta::Meta(
+ MetaNameValue {
+ ident: "bar".into(),
+ eq_token: Default::default(),
+ lit: lit(Literal::i32_unsuffixed(5)),
+ }.into(),
+ ),],
},
)
}
@@ -116,18 +114,16 @@
MetaList {
ident: "foo".into(),
paren_token: Default::default(),
- nested: punctuated![
- NestedMeta::Meta(
- MetaNameValue {
- ident: "bar".into(),
- eq_token: Default::default(),
- lit: Lit::Bool(LitBool {
- value: true,
- span: Span::call_site()
- }),
- }.into(),
- ),
- ],
+ nested: punctuated![NestedMeta::Meta(
+ MetaNameValue {
+ ident: "bar".into(),
+ eq_token: Default::default(),
+ lit: Lit::Bool(LitBool {
+ value: true,
+ span: Span::call_site()
+ }),
+ }.into(),
+ ),],
},
)
}
@@ -152,15 +148,13 @@
MetaList {
ident: "list".into(),
paren_token: Default::default(),
- nested: punctuated![
- NestedMeta::Meta(
- MetaNameValue {
- ident: "name2".into(),
- eq_token: Default::default(),
- lit: lit(Literal::i32_unsuffixed(6)),
- }.into(),
- ),
- ],
+ nested: punctuated![NestedMeta::Meta(
+ MetaNameValue {
+ ident: "name2".into(),
+ eq_token: Default::default(),
+ lit: lit(Literal::i32_unsuffixed(6)),
+ }.into(),
+ ),],
}.into(),
),
NestedMeta::Meta(Meta::Word("word2".into())),
diff --git a/tests/test_precedence.rs b/tests/test_precedence.rs
index b3f90d2..1c4814d 100644
--- a/tests/test_precedence.rs
+++ b/tests/test_precedence.rs
@@ -211,8 +211,8 @@
use syntax::ast::{Expr, ExprKind, Field, Mac, Pat, Stmt, StmtKind, Ty};
use syntax::ext::quote::rt::DUMMY_SP;
use syntax::fold::{self, Folder};
- use syntax::util::ThinVec;
use syntax::util::small_vector::SmallVector;
+ use syntax::util::ThinVec;
fn expr(node: ExprKind) -> P<Expr> {
P(Expr {