Skip to content

Commit be71fcc

Browse files
committed
librustc_codegen_ssa => 2018
1 parent 618f5a0 commit be71fcc

26 files changed

+75
-91
lines changed

src/librustc_codegen_ssa/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
authors = ["The Rust Project Developers"]
33
name = "rustc_codegen_ssa"
44
version = "0.0.0"
5+
edition = "2018"
56

67
[lib]
78
name = "rustc_codegen_ssa"

src/librustc_codegen_ssa/back/link.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_target::spec::LinkerFlavor;
99
use rustc::hir::def_id::CrateNum;
1010

1111
use super::command::Command;
12-
use CrateInfo;
12+
use crate::CrateInfo;
1313

1414
use cc::windows_registry;
1515
use std::fs;

src/librustc_codegen_ssa/back/lto.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::write::CodegenContext;
2-
use traits::*;
3-
use ModuleCodegen;
2+
use crate::traits::*;
3+
use crate::ModuleCodegen;
44

55
use rustc::util::time_graph::Timeline;
66
use rustc_errors::FatalError;

src/librustc_codegen_ssa/back/write.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
use {ModuleCodegen, ModuleKind, CachedModuleCodegen, CompiledModule, CrateInfo, CodegenResults,
2-
RLIB_BYTECODE_EXTENSION};
1+
use crate::{ModuleCodegen, ModuleKind, CachedModuleCodegen, CompiledModule, CrateInfo,
2+
CodegenResults, RLIB_BYTECODE_EXTENSION};
33
use super::linker::LinkerInfo;
44
use super::lto::{self, SerializedModule};
55
use super::link::{self, remove, get_linker};
66
use super::command::Command;
77
use super::symbol_export::ExportedSymbols;
88

9-
use memmap;
9+
use crate::traits::*;
1010
use rustc_incremental::{copy_cgu_workproducts_to_incr_comp_cache_dir,
1111
in_incr_comp_dir, in_incr_comp_dir_sess};
1212
use rustc::dep_graph::{WorkProduct, WorkProductId, WorkProductFileKind};
@@ -16,7 +16,6 @@ use rustc::session::config::{self, OutputFilenames, OutputType, Passes, Sanitize
1616
use rustc::session::Session;
1717
use rustc::util::nodemap::FxHashMap;
1818
use rustc::util::time_graph::{self, TimeGraph, Timeline};
19-
use traits::*;
2019
use rustc::hir::def_id::{CrateNum, LOCAL_CRATE};
2120
use rustc::ty::TyCtxt;
2221
use rustc::util::common::{time_depth, set_time_depth, print_time_passes_entry};

src/librustc_codegen_ssa/base.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//! but one llvm::Type corresponds to many `Ty`s; for instance, tup(int, int,
1414
//! int) and rec(x=int, y=int, z=int) will have the same llvm::Type.
1515
16-
use {ModuleCodegen, ModuleKind, CachedModuleCodegen};
16+
use crate::{ModuleCodegen, ModuleKind, CachedModuleCodegen};
1717

1818
use rustc::dep_graph::cgu_reuse_tracker::CguReuse;
1919
use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
@@ -28,26 +28,26 @@ use rustc::util::common::{time, print_time_passes_entry};
2828
use rustc::util::profiling::ProfileCategory;
2929
use rustc::session::config::{self, EntryFnType, Lto};
3030
use rustc::session::Session;
31-
use mir::place::PlaceRef;
32-
use back::write::{OngoingCodegen, start_async_codegen, submit_pre_lto_module_to_llvm,
33-
submit_post_lto_module_to_llvm};
34-
use {MemFlags, CrateInfo};
35-
use callee;
3631
use rustc_mir::monomorphize::item::DefPathBasedNames;
37-
use common::{RealPredicate, TypeKind, IntPredicate};
38-
use meth;
39-
use mir;
4032
use rustc::util::time_graph;
4133
use rustc_mir::monomorphize::Instance;
4234
use rustc_mir::monomorphize::partitioning::{CodegenUnit, CodegenUnitExt};
43-
use mono_item::MonoItem;
4435
use rustc::util::nodemap::FxHashMap;
4536
use rustc_data_structures::indexed_vec::Idx;
4637
use rustc_data_structures::sync::Lrc;
4738
use rustc_codegen_utils::{symbol_names_test, check_for_rustc_errors_attr};
4839
use rustc::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA};
40+
use crate::mir::place::PlaceRef;
41+
use crate::back::write::{OngoingCodegen, start_async_codegen, submit_pre_lto_module_to_llvm,
42+
submit_post_lto_module_to_llvm};
43+
use crate::{MemFlags, CrateInfo};
44+
use crate::callee;
45+
use crate::common::{RealPredicate, TypeKind, IntPredicate};
46+
use crate::meth;
47+
use crate::mir;
48+
use crate::mono_item::MonoItem;
4949

50-
use traits::*;
50+
use crate::traits::*;
5151

5252
use std::any::Any;
5353
use std::cmp;
@@ -58,7 +58,7 @@ use syntax_pos::Span;
5858
use syntax::attr;
5959
use rustc::hir;
6060

61-
use mir::operand::OperandValue;
61+
use crate::mir::operand::OperandValue;
6262

6363
use std::marker::PhantomData;
6464

src/librustc_codegen_ssa/callee.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use traits::*;
1+
use crate::traits::*;
22
use rustc::ty;
33
use rustc::ty::subst::Substs;
44
use rustc::hir::def_id::DefId;

src/librustc_codegen_ssa/common.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ use syntax_pos::{DUMMY_SP, Span};
55

66
use rustc::hir::def_id::DefId;
77
use rustc::middle::lang_items::LangItem;
8-
use base;
9-
use traits::*;
8+
use crate::base;
9+
use crate::traits::*;
1010

1111
use rustc::hir;
12-
use traits::BuilderMethods;
12+
use crate::traits::BuilderMethods;
1313

1414
pub fn type_needs_drop<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, ty: Ty<'tcx>) -> bool {
1515
ty.needs_drop(tcx, ty::ParamEnv::reveal_all())
@@ -123,7 +123,7 @@ pub enum TypeKind {
123123
mod temp_stable_hash_impls {
124124
use rustc_data_structures::stable_hasher::{StableHasherResult, StableHasher,
125125
HashStable};
126-
use ModuleCodegen;
126+
use crate::ModuleCodegen;
127127

128128
impl<HCX, M> HashStable<HCX> for ModuleCodegen<M> {
129129
fn hash_stable<W: StableHasherResult>(&self,

src/librustc_codegen_ssa/glue.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22
//
33
// Code relating to drop glue.
44

5-
use std;
6-
7-
use common::IntPredicate;
8-
use meth;
95
use rustc::ty::{self, Ty};
10-
use traits::*;
6+
use crate::common::IntPredicate;
7+
use crate::meth;
8+
use crate::traits::*;
119

1210
pub fn size_and_align_of_dst<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
1311
bx: &mut Bx,

src/librustc_codegen_ssa/lib.rs

+5-20
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,19 @@
1010
#![feature(nll)]
1111
#![allow(unused_attributes)]
1212
#![allow(dead_code)]
13+
#![deny(rust_2018_idioms)]
14+
#![allow(explicit_outlives_requirements)]
15+
#![allow(elided_lifetimes_in_paths)]
1316

1417
#![recursion_limit="256"]
1518

1619
//! This crate contains codegen code that is used by all codegen backends (LLVM and others).
1720
//! The backend-agnostic functions of this crate use functions defined in various traits that
1821
//! have to be implemented by each backends.
1922
20-
#[macro_use] extern crate bitflags;
2123
#[macro_use] extern crate log;
22-
extern crate rustc_apfloat;
23-
#[macro_use] extern crate rustc;
24-
extern crate rustc_target;
25-
extern crate rustc_mir;
24+
#[macro_use] extern crate rustc;
2625
#[macro_use] extern crate syntax;
27-
extern crate syntax_pos;
28-
extern crate rustc_incremental;
29-
extern crate rustc_codegen_utils;
30-
extern crate rustc_data_structures;
31-
extern crate rustc_allocator;
32-
extern crate rustc_fs_util;
33-
extern crate serialize;
34-
extern crate rustc_errors;
35-
extern crate rustc_demangle;
36-
extern crate cc;
37-
extern crate libc;
38-
extern crate jobserver;
39-
extern crate memmap;
40-
extern crate num_cpus;
4126

4227
use std::path::PathBuf;
4328
use rustc::dep_graph::WorkProduct;
@@ -133,7 +118,7 @@ pub enum ModuleKind {
133118
Allocator,
134119
}
135120

136-
bitflags! {
121+
bitflags::bitflags! {
137122
pub struct MemFlags: u8 {
138123
const VOLATILE = 1 << 0;
139124
const NONTEMPORAL = 1 << 1;

src/librustc_codegen_ssa/meth.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use rustc_target::abi::call::FnType;
2-
use callee;
32
use rustc_mir::monomorphize;
43

5-
use traits::*;
4+
use crate::callee;
5+
use crate::traits::*;
66

77
use rustc::ty::{self, Ty};
88

src/librustc_codegen_ssa/mir/analyze.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc::mir::traversal;
1010
use rustc::ty;
1111
use rustc::ty::layout::{LayoutOf, HasTyCtxt};
1212
use super::FunctionCx;
13-
use traits::*;
13+
use crate::traits::*;
1414

1515
pub fn non_ssa_locals<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
1616
fx: &FunctionCx<'a, 'tcx, Bx>

src/librustc_codegen_ssa/mir/block.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ use rustc::mir;
55
use rustc::mir::interpret::EvalErrorKind;
66
use rustc_target::abi::call::{ArgType, FnType, PassMode};
77
use rustc_target::spec::abi::Abi;
8-
use base;
9-
use MemFlags;
10-
use common::{self, IntPredicate};
11-
use meth;
128
use rustc_mir::monomorphize;
9+
use crate::base;
10+
use crate::MemFlags;
11+
use crate::common::{self, IntPredicate};
12+
use crate::meth;
1313

14-
use traits::*;
14+
use crate::traits::*;
1515

1616
use syntax::symbol::Symbol;
1717
use syntax_pos::Pos;

src/librustc_codegen_ssa/mir/constant.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc::mir::interpret::GlobalId;
66
use rustc::ty::{self, Ty};
77
use rustc::ty::layout;
88
use syntax::source_map::Span;
9-
use traits::*;
9+
use crate::traits::*;
1010

1111
use super::FunctionCx;
1212

src/librustc_codegen_ssa/mir/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ use rustc::ty::layout::{TyLayout, HasTyCtxt};
44
use rustc::mir::{self, Mir};
55
use rustc::ty::subst::Substs;
66
use rustc::session::config::DebugInfo;
7-
use base;
8-
use debuginfo::{self, VariableAccess, VariableKind, FunctionDebugContext};
97
use rustc_mir::monomorphize::Instance;
108
use rustc_target::abi::call::{FnType, PassMode};
11-
use traits::*;
9+
use crate::base;
10+
use crate::debuginfo::{self, VariableAccess, VariableKind, FunctionDebugContext};
11+
use crate::traits::*;
1212

1313
use syntax_pos::{DUMMY_SP, NO_EXPANSION, BytePos, Span};
1414
use syntax::symbol::keywords;

src/librustc_codegen_ssa/mir/operand.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use rustc::mir;
33
use rustc::ty;
44
use rustc::ty::layout::{self, Align, LayoutOf, TyLayout};
55

6-
use base;
7-
use MemFlags;
8-
use glue;
6+
use crate::base;
7+
use crate::MemFlags;
8+
use crate::glue;
99

10-
use traits::*;
10+
use crate::traits::*;
1111

1212
use std::fmt;
1313

src/librustc_codegen_ssa/mir/place.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ use rustc::ty::{self, Ty};
22
use rustc::ty::layout::{self, Align, TyLayout, LayoutOf, VariantIdx, HasTyCtxt};
33
use rustc::mir;
44
use rustc::mir::tcx::PlaceTy;
5-
use MemFlags;
6-
use common::IntPredicate;
7-
use glue;
5+
use crate::MemFlags;
6+
use crate::common::IntPredicate;
7+
use crate::glue;
88

9-
use traits::*;
9+
use crate::traits::*;
1010

1111
use super::{FunctionCx, LocalRef};
1212
use super::operand::OperandValue;

src/librustc_codegen_ssa/mir/rvalue.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ use rustc::middle::lang_items::ExchangeMallocFnLangItem;
66
use rustc_apfloat::{ieee, Float, Status, Round};
77
use std::{u128, i128};
88

9-
use base;
10-
use MemFlags;
11-
use callee;
12-
use common::{self, RealPredicate, IntPredicate};
9+
use crate::base;
10+
use crate::MemFlags;
11+
use crate::callee;
12+
use crate::common::{self, RealPredicate, IntPredicate};
1313
use rustc_mir::monomorphize;
1414

15-
use traits::*;
15+
use crate::traits::*;
1616

1717
use super::{FunctionCx, LocalRef};
1818
use super::operand::{OperandRef, OperandValue};

src/librustc_codegen_ssa/mir/statement.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use rustc::mir;
22

3-
use traits::BuilderMethods;
3+
use crate::traits::BuilderMethods;
44
use super::FunctionCx;
55
use super::LocalRef;
66
use super::OperandValue;
7-
use traits::*;
7+
use crate::traits::*;
88

99
impl<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
1010
pub fn codegen_statement(

src/librustc_codegen_ssa/mono_item.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use base;
21
use rustc::hir;
32
use rustc::hir::def::Def;
43
use rustc::mir::mono::{Linkage, Visibility};
54
use rustc::ty::layout::HasTyCtxt;
65
use std::fmt;
7-
use traits::*;
6+
use crate::base;
7+
use crate::traits::*;
88

99
pub use rustc::mir::mono::MonoItem;
1010

src/librustc_codegen_ssa/traits/asm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::BackendTypes;
2-
use mir::place::PlaceRef;
2+
use crate::mir::place::PlaceRef;
33
use rustc::hir::{GlobalAsm, InlineAsm};
44

55
pub trait AsmBuilderMethods<'tcx>: BackendTypes {

src/librustc_codegen_ssa/traits/builder.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ use super::debuginfo::DebugInfoBuilderMethods;
44
use super::intrinsic::IntrinsicCallMethods;
55
use super::type_::ArgTypeMethods;
66
use super::{HasCodegen, StaticBuilderMethods};
7-
use common::{AtomicOrdering, AtomicRmwBinOp, IntPredicate, RealPredicate, SynchronizationScope};
8-
use mir::operand::OperandRef;
9-
use mir::place::PlaceRef;
7+
use crate::common::{AtomicOrdering, AtomicRmwBinOp, IntPredicate, RealPredicate,
8+
SynchronizationScope};
9+
use crate::mir::operand::OperandRef;
10+
use crate::mir::place::PlaceRef;
11+
use crate::MemFlags;
1012
use rustc::ty::Ty;
1113
use rustc::ty::layout::{Align, Size};
1214
use std::ffi::CStr;
13-
use MemFlags;
1415

1516
use std::borrow::Cow;
1617
use std::ops::Range;

src/librustc_codegen_ssa/traits/consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::BackendTypes;
2-
use mir::place::PlaceRef;
2+
use crate::mir::place::PlaceRef;
33
use rustc::mir::interpret::Allocation;
44
use rustc::mir::interpret::Scalar;
55
use rustc::ty::layout;

src/librustc_codegen_ssa/traits/debuginfo.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::BackendTypes;
2-
use debuginfo::{FunctionDebugContext, MirDebugScope, VariableAccess, VariableKind};
2+
use crate::debuginfo::{FunctionDebugContext, MirDebugScope, VariableAccess, VariableKind};
33
use rustc::hir::def_id::CrateNum;
44
use rustc::mir;
55
use rustc::ty::{self, Ty};

src/librustc_codegen_ssa/traits/intrinsic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::BackendTypes;
2-
use mir::operand::OperandRef;
2+
use crate::mir::operand::OperandRef;
33
use rustc::ty::Ty;
44
use rustc_target::abi::call::FnType;
55
use syntax_pos::Span;

src/librustc_codegen_ssa/traits/type_.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use super::misc::MiscMethods;
22
use super::Backend;
33
use super::HasCodegen;
4-
use common::{self, TypeKind};
5-
use mir::place::PlaceRef;
4+
use crate::common::{self, TypeKind};
5+
use crate::mir::place::PlaceRef;
66
use rustc::ty::layout::{self, Align, Size, TyLayout};
77
use rustc::ty::{self, Ty};
88
use rustc::util::nodemap::FxHashMap;

0 commit comments

Comments
 (0)