1 files changed, 26 insertions, 33 deletions

diff --git a/src/librustc_macros/src/query.rs b/src/librustc_macros/src/query.rs
index 139e1b554cf..f680b0d64cd 100644
--- a/src/librustc_macros/src/query.rs
+++ b/src/librustc_macros/src/query.rs
@@ -1,15 +1,15 @@
+use itertools::Itertools;
 use proc_macro::TokenStream;
-use proc_macro2::{TokenTree, Delimiter};
+use proc_macro2::{Delimiter, TokenTree};
+use quote::quote;
+use syn;
+use syn::parse::{Parse, ParseStream, Result};
+use syn::punctuated::Punctuated;
+use syn::spanned::Spanned;
 use syn::{
-    Token, Ident, Type, Attribute, ReturnType, Expr, Block, Error,
-    braced, parenthesized, parse_macro_input,
+    braced, parenthesized, parse_macro_input, Attribute, Block, Error, Expr, Ident, ReturnType,
+    Token, Type,
 };
-use syn::spanned::Spanned;
-use syn::parse::{Result, Parse, ParseStream};
-use syn::punctuated::Punctuated;
-use syn;
-use quote::quote;
-use itertools::Itertools;
 
 #[allow(non_camel_case_types)]
 mod kw {
@@ -164,13 +164,7 @@ impl Parse for Query {
         braced!(content in input);
         let modifiers = content.parse()?;
 
-        Ok(Query {
-            modifiers,
-            name,
-            key,
-            arg,
-            result,
-        })
+        Ok(Query { modifiers, name, key, arg, result })
     }
 }
 
@@ -198,10 +192,7 @@ impl Parse for Group {
         let name: Ident = input.parse()?;
         let content;
         braced!(content in input);
-        Ok(Group {
-            name,
-            queries: content.parse()?,
-        })
+        Ok(Group { name, queries: content.parse()? })
     }
 }
 
@@ -352,14 +343,20 @@ fn add_query_description_impl(
             }
         };
 
-        let tcx = args.as_ref().map(|t| {
-            let t = &(t.0).0;
-            quote! { #t }
-        }).unwrap_or(quote! { _ });
-        let value = args.as_ref().map(|t| {
-            let t = &(t.1).0;
-            quote! { #t }
-        }).unwrap_or(quote! { _ });
+        let tcx = args
+            .as_ref()
+            .map(|t| {
+                let t = &(t.0).0;
+                quote! { #t }
+            })
+            .unwrap_or(quote! { _ });
+        let value = args
+            .as_ref()
+            .map(|t| {
+                let t = &(t.1).0;
+                quote! { #t }
+            })
+            .unwrap_or(quote! { _ });
         quote! {
             #[inline]
             #[allow(unused_variables)]
@@ -507,11 +504,7 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
                 });
             }
 
-            add_query_description_impl(
-                &query,
-                modifiers,
-                &mut query_description_stream,
-            );
+            add_query_description_impl(&query, modifiers, &mut query_description_stream);
         }
         let name = &group.name;
         query_stream.extend(quote! {