Reformat using the new identifier sorting from rustfmt

Author: compiler-errors

compiler/rustc_abi/src/layout.rs

@@ -999,8 +999,8 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
 if repr.can_randomize_type_layout() && cfg!(feature = "randomize"){
 #[cfg(feature = "randomize")]
 {
-use rand::seq::SliceRandom;
 use rand::SeedableRng;
+use rand::seq::SliceRandom;
 // `ReprOptions.field_shuffle_seed` is a deterministic seed we can use to randomize field
 // ordering.
 letmut rng =

compiler/rustc_abi/src/lib.rs

@@ -1138,13 +1138,10 @@ impl Scalar {
 #[inline]
 pubfnis_bool(&self) -> bool{
 useInteger::*;
-matches!(
-self,
-Scalar::Initialized{
- value:Primitive::Int(I8,false),
- valid_range:WrappingRange{ start:0, end:1}
-}
-)
+matches!(self,Scalar::Initialized{
+ value:Primitive::Int(I8,false),
+ valid_range:WrappingRange{ start:0, end:1}
+})
 }
 
 /// Get the primitive representation of this type, ignoring the valid range and whether the

compiler/rustc_ast/src/ast.rs

@@ -21,19 +21,19 @@
 use std::borrow::Cow;
 use std::{cmp, fmt, mem};
 
+pubuseGenericArgs::*;
+pubuseUnsafeSource::*;
 pubuse rustc_ast_ir::{Movability,Mutability};
 use rustc_data_structures::packed::Pu128;
 use rustc_data_structures::stable_hasher::{HashStable,StableHasher};
 use rustc_data_structures::stack::ensure_sufficient_stack;
 use rustc_data_structures::sync::Lrc;
 use rustc_macros::{Decodable,Encodable,HashStable_Generic};
-use rustc_span::source_map::{respan,Spanned};
-use rustc_span::symbol::{kw, sym,Ident,Symbol};
 pubuse rustc_span::AttrId;
-use rustc_span::{ErrorGuaranteed,Span,DUMMY_SP};
-usethin_vec::{thin_vec,ThinVec};
-pubuseGenericArgs::*;
-pubuseUnsafeSource::*;
+use rustc_span::source_map::{Spanned, respan};
+userustc_span::symbol::{Ident,Symbol, kw, sym};
+userustc_span::{DUMMY_SP,ErrorGuaranteed,Span};
+usethin_vec::{ThinVec, thin_vec};
 
 pubusecrate::format::*;
 usecrate::ptr::P;
@@ -288,7 +288,7 @@ impl ParenthesizedArgs {
 }
 }
 
-pubusecrate::node_id::{NodeId,CRATE_NODE_ID,DUMMY_NODE_ID};
+pubusecrate::node_id::{CRATE_NODE_ID,DUMMY_NODE_ID,NodeId};
 
 /// Modifiers on a trait bound like `~const`, `?` and `!`.
 #[derive(Copy,Clone,PartialEq,Eq,Encodable,Decodable,Debug)]

compiler/rustc_ast/src/attr/mod.rs

@@ -4,15 +4,15 @@ use std::iter;
 use std::sync::atomic::{AtomicU32,Ordering};
 
 use rustc_index::bit_set::GrowableBitSet;
-use rustc_span::symbol::{sym,Ident,Symbol};
 use rustc_span::Span;
-use smallvec::{smallvec,SmallVec};
-use thin_vec::{thin_vec,ThinVec};
+use rustc_span::symbol::{Ident,Symbol, sym};
+use smallvec::{SmallVec, smallvec};
+use thin_vec::{ThinVec, thin_vec};
 
 usecrate::ast::{
-AttrArgs,AttrArgsEq,AttrId,AttrItem,AttrKind,AttrStyle,AttrVec,Attribute,DelimArgs,
-Expr,ExprKind,LitKind,MetaItem,MetaItemKind,MetaItemLit,NestedMetaItem,NormalAttr,Path,
-PathSegment,Safety,DUMMY_NODE_ID,
+AttrArgs,AttrArgsEq,AttrId,AttrItem,AttrKind,AttrStyle,AttrVec,Attribute,DUMMY_NODE_ID,
+DelimArgs,Expr,ExprKind,LitKind,MetaItem,MetaItemKind,MetaItemLit,NestedMetaItem,
+NormalAttr,Path,PathSegment,Safety,
 };
 usecrate::ptr::P;
 usecrate::token::{self,CommentKind,Delimiter,Token};

compiler/rustc_ast/src/entry.rs

@@ -1,7 +1,7 @@
-use rustc_span::symbol::sym;
 use rustc_span::Symbol;
+use rustc_span::symbol::sym;
 
-usecrate::{attr,Attribute};
+usecrate::{Attribute, attr};
 
 #[derive(Debug)]
 pubenumEntryPointType{

compiler/rustc_ast/src/expand/allocator.rs

@@ -1,5 +1,5 @@
 use rustc_macros::HashStable_Generic;
-use rustc_span::symbol::{sym,Symbol};
+use rustc_span::symbol::{Symbol, sym};
 
 #[derive(Clone,Debug,Copy,Eq,PartialEq,HashStable_Generic)]
 pubenumAllocatorKind{

compiler/rustc_ast/src/format.rs

@@ -1,10 +1,10 @@
 use rustc_data_structures::fx::FxHashMap;
 use rustc_macros::{Decodable,Encodable};
-use rustc_span::symbol::{Ident,Symbol};
 use rustc_span::Span;
+use rustc_span::symbol::{Ident,Symbol};
 
-usecrate::ptr::P;
 usecrate::Expr;
+usecrate::ptr::P;
 
 // Definitions:
 //

compiler/rustc_ast/src/mut_visit.rs

@@ -13,10 +13,10 @@ use std::panic;
 use rustc_data_structures::flat_map_in_place::FlatMapInPlace;
 use rustc_data_structures::stack::ensure_sufficient_stack;
 use rustc_data_structures::sync::Lrc;
+use rustc_span::Span;
 use rustc_span::source_map::Spanned;
 use rustc_span::symbol::Ident;
-use rustc_span::Span;
-use smallvec::{smallvec,Array,SmallVec};
+use smallvec::{Array,SmallVec, smallvec};
 use thin_vec::ThinVec;
 
 usecrate::ast::*;

compiler/rustc_ast/src/token.rs

@@ -1,21 +1,21 @@
 use std::borrow::Cow;
 use std::fmt;
 
+pubuseBinOpToken::*;
+pubuseLitKind::*;
+pubuseNonterminal::*;
+pubuseNtExprKind::*;
+pubuseNtPatKind::*;
+pubuseTokenKind::*;
 use rustc_data_structures::stable_hasher::{HashStable,StableHasher};
 use rustc_data_structures::sync::Lrc;
 use rustc_macros::{Decodable,Encodable,HashStable_Generic};
 use rustc_span::edition::Edition;
-use rustc_span::symbol::{kw, sym};
 #[allow(clippy::useless_attribute)]// FIXME: following use of `hidden_glob_reexports` incorrectly triggers `useless_attribute` lint.
 #[allow(hidden_glob_reexports)]
 use rustc_span::symbol::{Ident,Symbol};
-use rustc_span::{ErrorGuaranteed,Span,DUMMY_SP};
-pubuseBinOpToken::*;
-pubuseLitKind::*;
-pubuseNonterminal::*;
-pubuseNtExprKind::*;
-pubuseNtPatKind::*;
-pubuseTokenKind::*;
+use rustc_span::symbol::{kw, sym};
+use rustc_span::{DUMMY_SP,ErrorGuaranteed,Span};
 
 usecrate::ast;
 usecrate::ptr::P;

compiler/rustc_ast/src/tokenstream.rs

@@ -20,7 +20,7 @@ use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::sync::{self,Lrc};
 use rustc_macros::{Decodable,Encodable,HashStable_Generic};
 use rustc_serialize::{Decodable,Encodable};
-use rustc_span::{sym,Span,SpanDecoder,SpanEncoder,Symbol,DUMMY_SP};
+use rustc_span::{DUMMY_SP,Span,SpanDecoder,SpanEncoder,Symbol,sym};
 
 usecrate::ast::{AttrStyle,StmtKind};
 usecrate::ast_traits::{HasAttrs,HasTokens};