Skip to content

Commit 6af7835

Browse files
bors-servobors-servo
authored
Auto merge of #271 - Atul9:cargo-fmt, r=SimonSapin
Format code using 'cargo fmt'
2 parents 3e91136 + a2accab commit 6af7835

File tree

6 files changed

+48
-53
lines changed

6 files changed

+48
-53
lines changed

‎procedural-masquerade/lib.rs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -253,33 +253,33 @@ macro_rules! define_invoke_proc_macro {
253253
#[doc(hidden)]
254254
#[macro_export]
255255
macro_rules! $macro_name {
256-
($proc_macro_name: ident ! $paren: tt) => {
257-
#[derive($proc_macro_name)]
258-
#[allow(unused)]
259-
enum ProceduralMasqueradeDummyType {
260-
// The magic happens here.
261-
//
262-
// We use an `enum` with an explicit discriminant
263-
// because that is the only case where a type definition
264-
// can contain a (const) expression.
265-
//
266-
// `(0, "foo").0` evalutes to 0, with the `"foo"` part ignored.
267-
//
268-
// By the time the `#[proc_macro_derive]` function
269-
// implementing `#[derive($proc_macro_name)]` is called,
270-
// `$paren` has already been replaced with the input of this inner macro,
271-
// but `stringify!` has not been expanded yet.
272-
//
273-
// This how arbitrary tokens can be inserted
274-
// in the input to the `#[proc_macro_derive]` function.
275-
//
276-
// Later, `stringify!(...)` is expanded into a string literal
277-
// which is then ignored.
278-
// Using `stringify!` enables passing arbitrary tokens
279-
// rather than only what can be parsed as a const expression.
280-
Input = (0, stringify! $paren ).0,
281-
}
282-
}
256+
($proc_macro_name: ident ! $paren: tt) => {
257+
#[derive($proc_macro_name)]
258+
#[allow(unused)]
259+
enum ProceduralMasqueradeDummyType {
260+
// The magic happens here.
261+
//
262+
// We use an `enum` with an explicit discriminant
263+
// because that is the only case where a type definition
264+
// can contain a (const) expression.
265+
//
266+
// `(0, "foo").0` evalutes to 0, with the `"foo"` part ignored.
267+
//
268+
// By the time the `#[proc_macro_derive]` function
269+
// implementing `#[derive($proc_macro_name)]` is called,
270+
// `$paren` has already been replaced with the input of this inner macro,
271+
// but `stringify!` has not been expanded yet.
272+
//
273+
// This how arbitrary tokens can be inserted
274+
// in the input to the `#[proc_macro_derive]` function.
275+
//
276+
// Later, `stringify!(...)` is expanded into a string literal
277+
// which is then ignored.
278+
// Using `stringify!` enables passing arbitrary tokens
279+
// rather than only what can be parsed as a const expression.
280+
Input = (0, stringify! $paren ).0,
283281
}
282+
}
283+
}
284284
};
285285
}

‎src/color.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ impl Color {
291291
let name = name.clone();
292292
return input.parse_nested_block(|arguments| {
293293
parse_color_function(component_parser, &*name, arguments)
294-
})
294+
});
295295
}
296296
_ => Err(()),
297297
}

‎src/nth.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ pub fn parse_nth<'i, 't>(input: &mut Parser<'i, 't>) -> Result<(i32, i32), Basic
7373
ref token => {
7474
let token = token.clone();
7575
Err(input.new_basic_unexpected_token_error(token))
76-
},
76+
}
7777
},
7878
ref token => {
7979
let token = token.clone();
8080
Err(input.new_basic_unexpected_token_error(token))
81-
},
81+
}
8282
}
8383
}
8484

‎src/parser.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -933,17 +933,15 @@ impl<'i: 't, 't> Parser<'i, 't> {
933933
Ok(&Token::Function(_))
934934
| Ok(&Token::ParenthesisBlock)
935935
| Ok(&Token::SquareBracketBlock)
936-
| Ok(&Token::CurlyBracketBlock) => {
937-
self.parse_nested_block(|input| {
938-
input.expect_no_error_token().map_err(Into::into)
939-
}).map_err(ParseError::<()>::basic)?
940-
}
936+
| Ok(&Token::CurlyBracketBlock) => self
937+
.parse_nested_block(|input| input.expect_no_error_token().map_err(Into::into))
938+
.map_err(ParseError::<()>::basic)?,
941939
Ok(t) => {
942940
// FIXME: maybe these should be separate variants of
943941
// BasicParseError instead?
944942
if t.is_parse_error() {
945943
let token = t.clone();
946-
return Err(self.new_basic_unexpected_token_error(token))
944+
return Err(self.new_basic_unexpected_token_error(token));
947945
}
948946
}
949947
Err(_) => return Ok(()),

‎src/rules_and_declarations.rs‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,9 @@ where
267267
loop {
268268
let start = self.input.state();
269269
match self.input.next_including_whitespace_and_comments() {
270-
Ok(&Token::WhiteSpace(_)) | Ok(&Token::Comment(_)) | Ok(&Token::Semicolon) => continue,
270+
Ok(&Token::WhiteSpace(_)) | Ok(&Token::Comment(_)) | Ok(&Token::Semicolon) => {
271+
continue
272+
}
271273
Ok(&Token::Ident(ref name)) => {
272274
let name = name.clone();
273275
let result = {
@@ -288,9 +290,7 @@ where
288290
Ok(token) => {
289291
let token = token.clone();
290292
let result = self.input.parse_until_after(Delimiter::Semicolon, |_| {
291-
Err(start
292-
.source_location()
293-
.new_unexpected_token_error(token))
293+
Err(start.source_location().new_unexpected_token_error(token))
294294
});
295295
return Some(result.map_err(|e| (e, self.input.slice_from(start.position()))));
296296
}
@@ -370,15 +370,13 @@ where
370370
let start = self.input.state();
371371

372372
let at_keyword = match self.input.next_byte()? {
373-
b'@' => {
374-
match self.input.next_including_whitespace_and_comments() {
375-
Ok(&Token::AtKeyword(ref name)) => Some(name.clone()),
376-
_ => {
377-
self.input.reset(&start);
378-
None
379-
},
373+
b'@' => match self.input.next_including_whitespace_and_comments() {
374+
Ok(&Token::AtKeyword(ref name)) => Some(name.clone()),
375+
_ => {
376+
self.input.reset(&start);
377+
None
380378
}
381-
}
379+
},
382380
_ => None,
383381
};
384382

‎src/tests.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,10 @@ fn serializer(preserve_comments: bool) {
469469
_ => None,
470470
};
471471
if let Some(closing_token) = closing_token {
472-
let result: Result<_, ParseError<()>> =
473-
input.parse_nested_block(|input| {
474-
write_to(previous_token, input, string, preserve_comments);
475-
Ok(())
476-
});
472+
let result: Result<_, ParseError<()>> = input.parse_nested_block(|input| {
473+
write_to(previous_token, input, string, preserve_comments);
474+
Ok(())
475+
});
477476
result.unwrap();
478477
closing_token.to_css(string).unwrap();
479478
}

0 commit comments

Comments
 (0)