Format with rustfmt 2018-12-10
diff --git a/src/lib.rs b/src/lib.rs
index c71afd7..23b4d75 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -535,9 +535,7 @@
impl Group {
fn _new(inner: imp::Group) -> Self {
- Group {
- inner: inner,
- }
+ Group { inner: inner }
}
fn _new_stable(inner: stable::Group) -> Self {
diff --git a/src/unstable.rs b/src/unstable.rs
index 57488dd..d8fe6f2 100644
--- a/src/unstable.rs
+++ b/src/unstable.rs
@@ -203,35 +203,30 @@
match streams.next() {
#[cfg(slow_extend)]
Some(TokenStream::Nightly(first)) => {
- let stream = iter::once(first).chain(streams.map(|s| {
- match s {
+ let stream = iter::once(first)
+ .chain(streams.map(|s| match s {
TokenStream::Nightly(s) => s,
TokenStream::Stable(_) => mismatch(),
- }
- })).collect();
+ }))
+ .collect();
TokenStream::Nightly(stream)
}
#[cfg(not(slow_extend))]
Some(TokenStream::Nightly(mut first)) => {
- first.extend(streams.map(|s| {
- match s {
- TokenStream::Nightly(s) => s,
- TokenStream::Stable(_) => mismatch(),
- }
+ first.extend(streams.map(|s| match s {
+ TokenStream::Nightly(s) => s,
+ TokenStream::Stable(_) => mismatch(),
}));
TokenStream::Nightly(first)
}
Some(TokenStream::Stable(mut first)) => {
- first.extend(streams.map(|s| {
- match s {
- TokenStream::Stable(s) => s,
- TokenStream::Nightly(_) => mismatch(),
- }
+ first.extend(streams.map(|s| match s {
+ TokenStream::Stable(s) => s,
+ TokenStream::Nightly(_) => mismatch(),
}));
TokenStream::Stable(first)
}
None => TokenStream::new(),
-
}
}
}
@@ -250,18 +245,16 @@
}
#[cfg(slow_extend)]
{
- *tts = tts
- .clone()
- .into_iter()
- .chain(
- streams
- .into_iter()
- .map(TokenStream::from)
- .flat_map(|t| match t {
+ *tts =
+ tts.clone()
+ .into_iter()
+ .chain(streams.into_iter().map(TokenStream::from).flat_map(
+ |t| match t {
TokenStream::Nightly(tts) => tts.into_iter(),
_ => mismatch(),
- }),
- ).collect();
+ },
+ ))
+ .collect();
}
}
TokenStream::Stable(tts) => tts.extend(streams),
@@ -282,14 +275,11 @@
*tts = tts
.clone()
.into_iter()
- .chain(
- streams
- .into_iter()
- .flat_map(|t| match t {
- TokenStream::Nightly(tts) => tts.into_iter(),
- _ => mismatch(),
- }),
- ).collect();
+ .chain(streams.into_iter().flat_map(|t| match t {
+ TokenStream::Nightly(tts) => tts.into_iter(),
+ _ => mismatch(),
+ }))
+ .collect();
}
}
TokenStream::Stable(tts) => {
@@ -473,9 +463,7 @@
pub fn unstable(self) -> proc_macro::Span {
match self {
Span::Nightly(s) => s,
- Span::Stable(_) => {
- panic!("proc_macro::Span is only available in procedural macros")
- }
+ Span::Stable(_) => panic!("proc_macro::Span is only available in procedural macros"),
}
}
@@ -581,9 +569,7 @@
};
Group::Nightly(proc_macro::Group::new(delimiter, stream))
}
- TokenStream::Stable(stream) => {
- Group::Stable(stable::Group::new(delimiter, stream))
- }
+ TokenStream::Stable(stream) => Group::Stable(stable::Group::new(delimiter, stream)),
}
}
@@ -594,7 +580,7 @@
proc_macro::Delimiter::Bracket => Delimiter::Bracket,
proc_macro::Delimiter::Brace => Delimiter::Brace,
proc_macro::Delimiter::None => Delimiter::None,
- }
+ },
Group::Stable(g) => g.delimiter(),
}
}