Cleanup imports

Author: Aaron1011

compiler/rustc_ast/src/ast_like.rs

@@ -1,7 +1,5 @@
 use super::ptr::P;
-use super::tokenstream::{
-    AttributesData, LazyTokenStream, PreexpTokenStream, PreexpTokenTree, Spacing,
-};
+use super::tokenstream::{AttributesData, LazyTokenStream};
 use super::{Arm, Field, FieldPat, GenericParam, Param, StructField, Variant};
 use super::{AssocItem, Expr, ForeignItem, Item, Local, MacCallStmt};
 use super::{AttrItem, AttrKind, Block, Pat, Path, Ty, Visibility};

compiler/rustc_ast/src/attr/mod.rs

@@ -7,8 +7,8 @@ use crate::ast::{MacArgs, MacDelimiter, MetaItem, MetaItemKind, NestedMetaItem};
 use crate::ast::{Path, PathSegment};
 use crate::token::{self, CommentKind, Token};
 use crate::tokenstream::{
-    AttributesData, DelimSpan, LazyTokenStream, PreexpTokenStream, PreexpTokenTree, Spacing,
-    TokenStream, TokenTree, TreeAndSpacing,
+    DelimSpan, LazyTokenStream, PreexpTokenStream, PreexpTokenTree, Spacing, TokenStream,
+    TokenTree, TreeAndSpacing,
 };
 
 use rustc_index::bit_set::GrowableBitSet;

compiler/rustc_expand/src/base.rs

@@ -3,7 +3,9 @@ use crate::module::DirectoryOwnership;
 
 use rustc_ast::ptr::P;
 use rustc_ast::token::{self, Nonterminal};
-use rustc_ast::tokenstream::{AttributesData, CanSynthesizeMissingTokens, LazyTokenStream, TokenStream};
+use rustc_ast::tokenstream::{
+    AttributesData, CanSynthesizeMissingTokens, LazyTokenStream, TokenStream,
+};
 use rustc_ast::visit::{AssocCtxt, Visitor};
 use rustc_ast::{self as ast, AstLike, Attribute, NodeId, PatKind};
 use rustc_attr::{self as attr, Deprecation, Stability};

compiler/rustc_expand/src/config.rs

@@ -6,9 +6,9 @@ use rustc_ast::mut_visit::*;
 use rustc_ast::ptr::P;
 use rustc_ast::token::{DelimToken, Token, TokenKind};
 use rustc_ast::tokenstream::{
-    DelimSpan, LazyTokenStream, PreexpTokenStream, PreexpTokenTree, Spacing, TokenStream, TokenTree,
+    DelimSpan, LazyTokenStream, PreexpTokenStream, PreexpTokenTree, Spacing, TokenTree,
 };
-use rustc_ast::{self as ast, AstLike, AttrItem, Attribute, AttrStyle, MetaItem};
+use rustc_ast::{self as ast, AstLike, AttrItem, AttrStyle, Attribute, MetaItem};
 use rustc_attr as attr;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::map_in_place::MapInPlace;

compiler/rustc_expand/src/expand.rs

@@ -12,7 +12,7 @@ use rustc_ast::ptr::P;
 use rustc_ast::token;
 use rustc_ast::tokenstream::TokenStream;
 use rustc_ast::visit::{self, AssocCtxt, Visitor};
-use rustc_ast::{AstLike, AttrItem, AttrStyle, Block, Inline, ItemKind, LitKind, MacArgs};
+use rustc_ast::{AstLike, AttrItem, Block, Inline, ItemKind, LitKind, MacArgs};
 use rustc_ast::{MacCallStmt, MacStmtStyle, MetaItemKind, ModKind, NestedMetaItem};
 use rustc_ast::{NodeId, PatKind, Path, StmtKind, Unsafe};
 use rustc_ast_pretty::pprust;