diff --git a/compiler/rustc_hir_typeck/src/expr_use_visitor.rs b/compiler/rustc_hir_typeck/src/expr_use_visitor.rs index 8206e79b3e3c8..372f52ba4128c 100644 --- a/compiler/rustc_hir_typeck/src/expr_use_visitor.rs +++ b/compiler/rustc_hir_typeck/src/expr_use_visitor.rs @@ -151,7 +151,8 @@ pub trait TypeInformationCtxt<'tcx> { } impl<'tcx> TypeInformationCtxt<'tcx> for (TyCtxt<'tcx>, LocalDefId) { - type TypeckResults<'a> = &'tcx ty::TypeckResults<'tcx> + type TypeckResults<'a> + = &'tcx ty::TypeckResults<'tcx> where Self: 'a; diff --git a/compiler/rustc_middle/src/mir/syntax.rs b/compiler/rustc_middle/src/mir/syntax.rs index cc8e66a797b53..e44fbbe19835c 100644 --- a/compiler/rustc_middle/src/mir/syntax.rs +++ b/compiler/rustc_middle/src/mir/syntax.rs @@ -9,10 +9,10 @@ use rustc_hir::def_id::DefId; use rustc_hir::{CoroutineKind, ItemLocalId}; use rustc_index::IndexVec; use rustc_macros::{HashStable, TyDecodable, TyEncodable, TypeFoldable, TypeVisitable}; +use rustc_span::Span; use rustc_span::def_id::LocalDefId; use rustc_span::source_map::Spanned; use rustc_span::symbol::Symbol; -use rustc_span::Span; use rustc_target::abi::{FieldIdx, VariantIdx}; use rustc_target::asm::InlineAsmRegOrRegClass; use smallvec::SmallVec; diff --git a/compiler/rustc_mir_transform/src/lint_tail_expr_drop_order.rs b/compiler/rustc_mir_transform/src/lint_tail_expr_drop_order.rs index 029b2b0f02958..bd4dfbe70b38f 100644 --- a/compiler/rustc_mir_transform/src/lint_tail_expr_drop_order.rs +++ b/compiler/rustc_mir_transform/src/lint_tail_expr_drop_order.rs @@ -1,10 +1,10 @@ use rustc_hir::def_id::LocalDefId; use rustc_hir::{ExprKind, HirId, HirIdSet, OwnerId}; -use rustc_index::bit_set::{BitSet, ChunkedBitSet}; use rustc_index::IndexVec; +use rustc_index::bit_set::{BitSet, ChunkedBitSet}; use rustc_lint::{self as lint, Level}; use rustc_macros::LintDiagnostic; -use rustc_middle::mir::{dump_mir, BasicBlock, Body, Local, Location, TerminatorKind}; +use rustc_middle::mir::{BasicBlock, Body, Local, Location, TerminatorKind, dump_mir}; use rustc_middle::ty::{self, Ty, TyCtxt}; use rustc_mir_dataflow::impls::MaybeInitializedPlaces; use rustc_mir_dataflow::move_paths::MoveData;