Skip to content

Commit 1ccb0b4

Browse files
committed
rustc -> rustc_middle part 3 (rustfmt)
1 parent 0cb9e36 commit 1ccb0b4

File tree

297 files changed

+771
-739
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

297 files changed

+771
-739
lines changed

src/librustc_codegen_llvm/abi.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ use crate::type_::Type;
55
use crate::type_of::LayoutLlvmExt;
66
use crate::value::Value;
77

8-
use rustc_middle::bug;
9-
use rustc_middle::ty::layout::{self};
10-
use rustc_middle::ty::Ty;
118
use rustc_codegen_ssa::mir::operand::OperandValue;
129
use rustc_codegen_ssa::mir::place::PlaceRef;
1310
use rustc_codegen_ssa::traits::*;
1411
use rustc_codegen_ssa::MemFlags;
12+
use rustc_middle::bug;
13+
use rustc_middle::ty::layout::{self};
14+
use rustc_middle::ty::Ty;
1515
use rustc_target::abi::call::ArgAbi;
1616
use rustc_target::abi::{HasDataLayout, LayoutOf};
1717

src/librustc_codegen_llvm/allocator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::attributes;
22
use libc::c_uint;
3+
use rustc_ast::expand::allocator::{AllocatorKind, AllocatorTy, ALLOCATOR_METHODS};
34
use rustc_middle::bug;
45
use rustc_middle::ty::TyCtxt;
5-
use rustc_ast::expand::allocator::{AllocatorKind, AllocatorTy, ALLOCATOR_METHODS};
66

77
use crate::llvm::{self, False, True};
88
use crate::ModuleLlvm;

src/librustc_codegen_llvm/attributes.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
33
use std::ffi::CString;
44

5-
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
6-
use rustc_middle::ty::layout::HasTyCtxt;
7-
use rustc_middle::ty::query::Providers;
8-
use rustc_middle::ty::{self, Ty, TyCtxt};
95
use rustc_codegen_ssa::traits::*;
106
use rustc_data_structures::const_cstr;
117
use rustc_data_structures::fx::FxHashMap;
128
use rustc_data_structures::small_c_str::SmallCStr;
139
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
10+
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
11+
use rustc_middle::ty::layout::HasTyCtxt;
12+
use rustc_middle::ty::query::Providers;
13+
use rustc_middle::ty::{self, Ty, TyCtxt};
1414
use rustc_session::config::{OptLevel, Sanitizer};
1515
use rustc_session::Session;
1616
use rustc_target::abi::call::Conv;

src/librustc_codegen_llvm/back/lto.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ use crate::llvm::archive_ro::ArchiveRO;
66
use crate::llvm::{self, False, True};
77
use crate::{LlvmCodegenBackend, ModuleLlvm};
88
use log::{debug, info};
9-
use rustc_middle::bug;
10-
use rustc_middle::dep_graph::WorkProduct;
11-
use rustc_middle::middle::exported_symbols::SymbolExportLevel;
129
use rustc_codegen_ssa::back::lto::{LtoModuleCodegen, SerializedModule, ThinModule, ThinShared};
1310
use rustc_codegen_ssa::back::symbol_export;
1411
use rustc_codegen_ssa::back::write::{CodegenContext, FatLTOInput, ModuleConfig};
@@ -17,6 +14,9 @@ use rustc_codegen_ssa::{ModuleCodegen, ModuleKind, RLIB_BYTECODE_EXTENSION};
1714
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1815
use rustc_errors::{FatalError, Handler};
1916
use rustc_hir::def_id::LOCAL_CRATE;
17+
use rustc_middle::bug;
18+
use rustc_middle::dep_graph::WorkProduct;
19+
use rustc_middle::middle::exported_symbols::SymbolExportLevel;
2020
use rustc_session::cgu_reuse_tracker::CguReuse;
2121
use rustc_session::config::{self, Lto};
2222

src/librustc_codegen_llvm/back/write.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ use crate::type_::Type;
1414
use crate::LlvmCodegenBackend;
1515
use crate::ModuleLlvm;
1616
use log::debug;
17-
use rustc_middle::bug;
18-
use rustc_middle::ty::TyCtxt;
1917
use rustc_codegen_ssa::back::write::{BitcodeSection, CodegenContext, EmitObj, ModuleConfig};
2018
use rustc_codegen_ssa::traits::*;
2119
use rustc_codegen_ssa::{CompiledModule, ModuleCodegen, RLIB_BYTECODE_EXTENSION};
2220
use rustc_data_structures::small_c_str::SmallCStr;
2321
use rustc_errors::{FatalError, Handler};
2422
use rustc_fs_util::{link_or_copy, path_to_c_string};
2523
use rustc_hir::def_id::LOCAL_CRATE;
24+
use rustc_middle::bug;
25+
use rustc_middle::ty::TyCtxt;
2626
use rustc_session::config::{self, Lto, OutputType, Passes, Sanitizer, SwitchWithOptPath};
2727
use rustc_session::Session;
2828

src/librustc_codegen_llvm/base.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ use crate::llvm;
2323
use crate::metadata;
2424
use crate::value::Value;
2525

26+
use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
27+
use rustc_codegen_ssa::mono_item::MonoItemExt;
28+
use rustc_codegen_ssa::traits::*;
29+
use rustc_codegen_ssa::{ModuleCodegen, ModuleKind};
30+
use rustc_data_structures::small_c_str::SmallCStr;
2631
use rustc_middle::dep_graph;
2732
use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
2833
use rustc_middle::middle::cstore::EncodedMetadata;
2934
use rustc_middle::middle::exported_symbols;
3035
use rustc_middle::mir::mono::{Linkage, Visibility};
3136
use rustc_middle::ty::TyCtxt;
32-
use rustc_codegen_ssa::base::maybe_create_entry_wrapper;
33-
use rustc_codegen_ssa::mono_item::MonoItemExt;
34-
use rustc_codegen_ssa::traits::*;
35-
use rustc_codegen_ssa::{ModuleCodegen, ModuleKind};
36-
use rustc_data_structures::small_c_str::SmallCStr;
3737
use rustc_session::config::DebugInfo;
3838
use rustc_span::symbol::Symbol;
3939

src/librustc_codegen_llvm/consts.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@ use crate::type_of::LayoutLlvmExt;
77
use crate::value::Value;
88
use libc::c_uint;
99
use log::debug;
10+
use rustc_codegen_ssa::traits::*;
11+
use rustc_hir as hir;
12+
use rustc_hir::def_id::DefId;
13+
use rustc_hir::Node;
1014
use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
11-
use rustc_middle::mir::interpret::{read_target_uint, Allocation, ConstValue, ErrorHandled, Pointer};
15+
use rustc_middle::mir::interpret::{
16+
read_target_uint, Allocation, ConstValue, ErrorHandled, Pointer,
17+
};
1218
use rustc_middle::mir::mono::MonoItem;
1319
use rustc_middle::ty::layout::{self, Align, LayoutOf, Size};
1420
use rustc_middle::ty::{self, Instance, Ty};
1521
use rustc_middle::{bug, span_bug};
16-
use rustc_codegen_ssa::traits::*;
17-
use rustc_hir as hir;
18-
use rustc_hir::def_id::DefId;
19-
use rustc_hir::Node;
2022
use rustc_span::symbol::{sym, Symbol};
2123
use rustc_span::Span;
2224
use rustc_target::abi::HasDataLayout;

src/librustc_codegen_llvm/debuginfo/gdb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use crate::llvm;
55
use crate::builder::Builder;
66
use crate::common::CodegenCx;
77
use crate::value::Value;
8-
use rustc_middle::bug;
98
use rustc_codegen_ssa::traits::*;
9+
use rustc_middle::bug;
1010
use rustc_session::config::DebugInfo;
1111

1212
use rustc_ast::attr;

src/librustc_codegen_llvm/debuginfo/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@ use crate::llvm;
1212
use crate::llvm::debuginfo::{
1313
DIArray, DIBuilder, DIFile, DIFlags, DILexicalBlock, DISPFlags, DIScope, DIType, DIVariable,
1414
};
15-
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef};
1615
use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, LOCAL_CRATE};
16+
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef};
1717

1818
use crate::abi::FnAbi;
1919
use crate::builder::Builder;
2020
use crate::common::CodegenCx;
2121
use crate::value::Value;
22-
use rustc_middle::mir;
23-
use rustc_middle::ty::{self, Instance, ParamEnv, Ty};
2422
use rustc_codegen_ssa::debuginfo::type_names;
2523
use rustc_codegen_ssa::mir::debuginfo::{DebugScope, FunctionDebugContext, VariableKind};
2624
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
2725
use rustc_index::vec::IndexVec;
26+
use rustc_middle::mir;
27+
use rustc_middle::ty::{self, Instance, ParamEnv, Ty};
2828
use rustc_session::config::{self, DebugInfo};
2929

3030
use libc::c_uint;
3131
use log::debug;
3232
use std::cell::RefCell;
3333

34-
use rustc_middle::ty::layout::{self, HasTyCtxt, LayoutOf, Size};
3534
use rustc_ast::ast;
3635
use rustc_codegen_ssa::traits::*;
36+
use rustc_middle::ty::layout::{self, HasTyCtxt, LayoutOf, Size};
3737
use rustc_span::symbol::Symbol;
3838
use rustc_span::{self, BytePos, Span};
3939
use smallvec::SmallVec;

src/librustc_codegen_llvm/debuginfo/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
use super::namespace::item_namespace;
44
use super::CrateDebugContext;
55

6-
use rustc_middle::ty::DefIdTree;
76
use rustc_hir::def_id::DefId;
7+
use rustc_middle::ty::DefIdTree;
88

99
use crate::common::CodegenCx;
1010
use crate::llvm;

0 commit comments

Comments
 (0)