Format

Author: tiif

src/tools/miri/src/concurrency/thread.rs

@@ -15,7 +15,6 @@ use rustc_middle::mir::Mutability;
 use rustc_middle::ty::layout::TyAndLayout;
 use rustc_span::Span;
 
-
 use crate::concurrency::data_race;
 use crate::shims::tls;
 use crate::*;

src/tools/miri/src/eval.rs

@@ -6,14 +6,13 @@ use std::path::PathBuf;
 use std::task::Poll;
 use std::{iter, thread};
 
-
+use rustc_abi::ExternAbi;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir::def::Namespace;
 use rustc_hir::def_id::DefId;
 use rustc_middle::ty::layout::{LayoutCx, LayoutOf};
 use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_session::config::EntryFnType;
-use rustc_abi::ExternAbi;
 
 use crate::concurrency::thread::TlsAllocAction;
 use crate::diagnostics::report_leaks;

src/tools/miri/src/helpers.rs

@@ -19,10 +19,7 @@ use rustc_middle::ty::layout::{FnAbiOf, LayoutOf, MaybeResult, TyAndLayout};
 use rustc_middle::ty::{self, FloatTy, IntTy, Ty, TyCtxt, UintTy};
 use rustc_session::config::CrateType;
 use rustc_span::{Span, Symbol};
-use rustc_target::callconv::FnAbi;
-use rustc_target::callconv::Conv;
-
-
+use rustc_target::callconv::{Conv, FnAbi};
 
 use crate::*;
 

src/tools/miri/src/machine.rs

@@ -10,7 +10,7 @@ use std::{fmt, process};
 
 use rand::rngs::StdRng;
 use rand::{Rng, SeedableRng};
-use rustc_abi::{Align, Size};
+use rustc_abi::{Align, ExternAbi, Size};
 use rustc_target::callconv::FnAbi;
 use rustc_attr::InlineAttr;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
@@ -25,8 +25,6 @@ use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
 use rustc_session::config::InliningThreshold;
 use rustc_span::def_id::{CrateNum, DefId};
 use rustc_span::{Span, SpanData, Symbol};
-use rustc_abi::ExternAbi;
-
 
 use crate::concurrency::cpu_affinity::{self, CpuAffinityMask};
 use crate::concurrency::data_race::{self, NaReadType, NaWriteType};

src/tools/miri/src/shims/backtrace.rs

@@ -2,8 +2,7 @@ use rustc_abi::Size;
 use rustc_middle::ty::layout::LayoutOf as _;
 use rustc_middle::ty::{self, Instance, Ty};
 use rustc_span::{BytePos, Loc, Symbol, hygiene};
-use rustc_target::callconv::FnAbi;
-use rustc_target::callconv::Conv;
+use rustc_target::callconv::{Conv, FnAbi};
 
 use crate::helpers::check_min_arg_count;
 use crate::*;

src/tools/miri/src/shims/foreign_items.rs

@@ -10,10 +10,10 @@ use rustc_hir::def::DefKind;
 use rustc_hir::def_id::CrateNum;
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::{mir, ty};
-use rustc_span::Symbol;
-use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;
-use rustc_target::callconv::Conv;
+use rustc_span::Symbol;
+use rustc_target::callconv::{Conv, FnAbi};
+
 
 use self::helpers::{ToHost, ToSoft};
 use super::alloc::EvalContextExt as _;

src/tools/miri/src/shims/panic.rs

@@ -11,11 +11,9 @@
 //!   gets popped *during unwinding*, we take the panic payload and store it according to the extra
 //!   metadata we remembered when pushing said frame.
 
-
+use rustc_abi::ExternAbi;
 use rustc_middle::{mir, ty};
 use rustc_target::spec::PanicStrategy;
-use rustc_abi::ExternAbi;
-
 
 use self::helpers::check_arg_count;
 use crate::*;

src/tools/miri/src/shims/tls.rs

@@ -4,7 +4,7 @@ use std::collections::BTreeMap;
 use std::collections::btree_map::Entry as BTreeEntry;
 use std::task::Poll;
 
-use rustc_abi::{HasDataLayout, Size, ExternAbi};
+use rustc_abi::{ExternAbi, HasDataLayout, Size};
 use rustc_middle::ty;
 
 use crate::*;

src/tools/miri/src/shims/unix/android/foreign_items.rs

@@ -1,8 +1,7 @@
-
-use rustc_span::Symbol;
-use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;
-use rustc_target::callconv::Conv;
+use rustc_span::Symbol;
+use rustc_target::callconv::{Conv, FnAbi};
+
 
 
 use crate::shims::unix::android::thread::prctl;

src/tools/miri/src/shims/unix/android/thread.rs

@@ -1,8 +1,7 @@
 use rustc_abi::Size;
-use rustc_span::Symbol;
-use rustc_target::callconv::FnAbi;
 use rustc_middle::ty::Ty;
-use rustc_target::callconv::Conv;
+use rustc_span::Symbol;
+use rustc_target::callconv::{Conv, FnAbi};
 
 use crate::helpers::check_min_arg_count;
 use crate::shims::unix::thread::{EvalContextExt as _, ThreadNameResult};