Skip to content

Commit fe27623

Browse files
taiki-etaiki-e
committed
librustc_typeck => 2018
1 parent 43e04fb commit fe27623

30 files changed

+98
-100
lines changed

‎src/librustc_typeck/Cargo.toml

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

67
[lib]
78
name = "rustc_typeck"
@@ -14,7 +15,7 @@ arena = { path = "../libarena" }
1415
log = "0.4"
1516
rustc = { path = "../librustc" }
1617
rustc_data_structures = { path = "../librustc_data_structures" }
17-
rustc_errors = { path = "../librustc_errors" }
18+
errors = { path = "../librustc_errors", package = "rustc_errors" }
1819
rustc_target = { path = "../librustc_target" }
1920
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }
2021
syntax = { path = "../libsyntax" }

‎src/librustc_typeck/astconv.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
//! instance of `AstConv`.
44
55
use errors::{Applicability, DiagnosticId};
6-
use hir::{self, GenericArg, GenericArgs};
7-
use hir::def::Def;
8-
use hir::def_id::DefId;
9-
use hir::HirVec;
10-
use lint;
11-
use middle::resolve_lifetime as rl;
12-
use namespace::Namespace;
6+
use crate::hir::{self, GenericArg, GenericArgs};
7+
use crate::hir::def::Def;
8+
use crate::hir::def_id::DefId;
9+
use crate::hir::HirVec;
10+
use crate::lint;
11+
use crate::middle::resolve_lifetime as rl;
12+
use crate::namespace::Namespace;
1313
use rustc::lint::builtin::AMBIGUOUS_ASSOCIATED_ITEMS;
1414
use rustc::traits;
1515
use rustc::ty::{self, Ty, TyCtxt, ToPredicate, TypeFoldable};
@@ -18,15 +18,15 @@ use rustc::ty::subst::{Kind, Subst, Substs};
1818
use rustc::ty::wf::object_region_bounds;
1919
use rustc_data_structures::sync::Lrc;
2020
use rustc_target::spec::abi;
21-
use require_c_abi_if_variadic;
21+
use crate::require_c_abi_if_variadic;
2222
use smallvec::SmallVec;
2323
use syntax::ast;
2424
use syntax::feature_gate::{GateIssue, emit_feature_err};
2525
use syntax::ptr::P;
2626
use syntax::util::lev_distance::find_best_match_for_name;
2727
use syntax_pos::{DUMMY_SP, Span, MultiSpan};
28-
use util::common::ErrorReported;
29-
use util::nodemap::FxHashMap;
28+
use crate::util::common::ErrorReported;
29+
use crate::util::nodemap::FxHashMap;
3030

3131
use std::collections::BTreeSet;
3232
use std::iter;

‎src/librustc_typeck/check/_match.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
use check::{FnCtxt, Expectation, Diverges, Needs};
2-
use check::coercion::CoerceMany;
1+
use crate::check::{FnCtxt, Expectation, Diverges, Needs};
2+
use crate::check::coercion::CoerceMany;
3+
use crate::util::nodemap::FxHashMap;
34
use errors::Applicability;
45
use rustc::hir::{self, PatKind};
56
use rustc::hir::def::{Def, CtorKind};
@@ -13,7 +14,6 @@ use syntax::source_map::Spanned;
1314
use syntax::ptr::P;
1415
use syntax::util::lev_distance::find_best_match_for_name;
1516
use syntax_pos::Span;
16-
use util::nodemap::FxHashMap;
1717

1818
use std::collections::hash_map::Entry::{Occupied, Vacant};
1919
use std::cmp;

‎src/librustc_typeck/check/cast.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
use super::FnCtxt;
3232

3333
use errors::{DiagnosticBuilder,Applicability};
34-
use hir::def_id::DefId;
35-
use lint;
34+
use crate::hir::def_id::DefId;
35+
use crate::lint;
3636
use rustc::hir;
3737
use rustc::session::Session;
3838
use rustc::traits;
@@ -43,7 +43,7 @@ use rustc::ty::subst::Substs;
4343
use rustc::middle::lang_items;
4444
use syntax::ast;
4545
use syntax_pos::Span;
46-
use util::common::ErrorReported;
46+
use crate::util::common::ErrorReported;
4747

4848
/// Reifies a cast check to be checked once we have full type information for
4949
/// a function context.
@@ -294,7 +294,7 @@ impl<'a, 'gcx, 'tcx> CastCheck<'tcx> {
294294
.emit();
295295
}
296296
CastError::SizedUnsizedCast => {
297-
use structured_errors::{SizedUnsizedCastError, StructuredDiagnostic};
297+
use crate::structured_errors::{SizedUnsizedCastError, StructuredDiagnostic};
298298
SizedUnsizedCastError::new(&fcx.tcx.sess,
299299
self.span,
300300
self.expr_ty,

‎src/librustc_typeck/check/closure.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
33
use super::{check_fn, Expectation, FnCtxt, GeneratorTypes};
44

5-
use astconv::AstConv;
6-
use middle::region;
5+
use crate::astconv::AstConv;
6+
use crate::middle::region;
77
use rustc::hir::def_id::DefId;
88
use rustc::infer::{InferOk, InferResult};
99
use rustc::infer::LateBoundRegionConversionTime;

‎src/librustc_typeck/check/coercion.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
//! sort of a minor point so I've opted to leave it for later---after all
5151
//! we may want to adjust precisely when coercions occur.
5252
53-
use check::{FnCtxt, Needs};
53+
use crate::check::{FnCtxt, Needs};
5454
use errors::DiagnosticBuilder;
5555
use rustc::hir;
5656
use rustc::hir::def_id::DefId;

‎src/librustc_typeck/check/demand.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use check::FnCtxt;
1+
use crate::check::FnCtxt;
22
use rustc::infer::InferOk;
33
use rustc::traits::{ObligationCause, ObligationCauseCode};
44

‎src/librustc_typeck/check/dropck.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
use check::regionck::RegionCtxt;
1+
use crate::check::regionck::RegionCtxt;
22

3-
use hir::def_id::DefId;
3+
use crate::hir::def_id::DefId;
44
use rustc::infer::outlives::env::OutlivesEnvironment;
55
use rustc::infer::{self, InferOk, SuppressRegionErrors};
66
use rustc::middle::region;
77
use rustc::traits::{ObligationCause, TraitEngine, TraitEngineExt};
88
use rustc::ty::subst::{Subst, Substs, UnpackedKind};
99
use rustc::ty::{self, Ty, TyCtxt};
10-
use util::common::ErrorReported;
10+
use crate::util::common::ErrorReported;
1111

1212
use syntax::ast;
1313
use syntax_pos::Span;

‎src/librustc_typeck/check/generator_interior.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc::ty::{self, Ty};
1111
use rustc_data_structures::sync::Lrc;
1212
use syntax_pos::Span;
1313
use super::FnCtxt;
14-
use util::nodemap::FxHashMap;
14+
use crate::util::nodemap::FxHashMap;
1515

1616
struct InteriorVisitor<'a, 'gcx: 'a+'tcx, 'tcx: 'a> {
1717
fcx: &'a FnCtxt<'a, 'gcx, 'tcx>,

‎src/librustc_typeck/check/intrinsic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use rustc::traits::{ObligationCause, ObligationCauseCode};
55
use rustc::ty::{self, TyCtxt, Ty};
66
use rustc::ty::subst::Subst;
7-
use require_same_types;
7+
use crate::require_same_types;
88

99
use rustc_target::spec::abi::Abi;
1010
use syntax::symbol::Symbol;

‎src/librustc_typeck/check/method/confirm.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use super::{probe, MethodCallee};
22

3-
use astconv::AstConv;
4-
use check::{FnCtxt, PlaceOp, callee, Needs};
5-
use hir::GenericArg;
6-
use hir::def_id::DefId;
3+
use crate::astconv::AstConv;
4+
use crate::check::{FnCtxt, PlaceOp, callee, Needs};
5+
use crate::hir::GenericArg;
6+
use crate::hir::def_id::DefId;
77
use rustc::ty::subst::Substs;
88
use rustc::traits;
99
use rustc::ty::{self, Ty, GenericParamDefKind};

‎src/librustc_typeck/check/method/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ pub use self::MethodError::*;
1010
pub use self::CandidateSource::*;
1111
pub use self::suggest::{SelfSource, TraitInfo};
1212

13-
use check::FnCtxt;
13+
use crate::check::FnCtxt;
14+
use crate::namespace::Namespace;
1415
use errors::{Applicability, DiagnosticBuilder};
15-
use namespace::Namespace;
1616
use rustc_data_structures::sync::Lrc;
1717
use rustc::hir;
1818
use rustc::hir::def::Def;
@@ -29,7 +29,7 @@ use syntax_pos::Span;
2929
use crate::{check_type_alias_enum_variants_enabled};
3030
use self::probe::{IsSuggestion, ProbeScope};
3131

32-
pub fn provide(providers: &mut ty::query::Providers) {
32+
pub fn provide(providers: &mut ty::query::Providers<'_>) {
3333
suggest::provide(providers);
3434
probe::provide(providers);
3535
}

‎src/librustc_typeck/check/method/probe.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use super::NoMatchData;
33
use super::{CandidateSource, ImplSource, TraitSource};
44
use super::suggest;
55

6-
use check::autoderef::{self, Autoderef};
7-
use check::FnCtxt;
8-
use hir::def_id::DefId;
9-
use hir::def::Def;
10-
use namespace::Namespace;
6+
use crate::check::autoderef::{self, Autoderef};
7+
use crate::check::FnCtxt;
8+
use crate::hir::def_id::DefId;
9+
use crate::hir::def::Def;
10+
use crate::namespace::Namespace;
1111

1212
use rustc_data_structures::sync::Lrc;
1313
use rustc::hir;

‎src/librustc_typeck/check/method/suggest.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
//! Give useful errors and suggestions to users when an item can't be
22
//! found or is otherwise invalid.
33
4-
use check::FnCtxt;
4+
use crate::check::FnCtxt;
5+
use crate::middle::lang_items::FnOnceTraitLangItem;
6+
use crate::namespace::Namespace;
7+
use crate::util::nodemap::FxHashSet;
58
use errors::{Applicability, DiagnosticBuilder};
6-
use middle::lang_items::FnOnceTraitLangItem;
7-
use namespace::Namespace;
89
use rustc_data_structures::sync::Lrc;
910
use rustc::hir::{self, ExprKind, Node, QPath};
1011
use rustc::hir::def::Def;
@@ -15,7 +16,6 @@ use rustc::infer::type_variable::TypeVariableOrigin;
1516
use rustc::traits::Obligation;
1617
use rustc::ty::{self, Adt, Ty, TyCtxt, ToPolyTraitRef, ToPredicate, TypeFoldable};
1718
use rustc::ty::item_path::with_crate_prefix;
18-
use util::nodemap::FxHashSet;
1919
use syntax_pos::{Span, FileName};
2020
use syntax::ast;
2121
use syntax::util::lev_distance::find_best_match_for_name;

‎src/librustc_typeck/check/mod.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ mod generator_interior;
8383
pub mod intrinsic;
8484
mod op;
8585

86-
use astconv::{AstConv, PathSeg};
86+
use crate::astconv::{AstConv, PathSeg};
8787
use errors::{Applicability, DiagnosticBuilder, DiagnosticId};
8888
use rustc::hir::{self, ExprKind, GenericArg, ItemKind, Node, PatKind, QPath};
8989
use rustc::hir::def::{CtorKind, Def};
9090
use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
9191
use rustc::hir::intravisit::{self, Visitor, NestedVisitorMap};
9292
use rustc::hir::itemlikevisit::ItemLikeVisitor;
93-
use middle::lang_items;
94-
use namespace::Namespace;
93+
use crate::middle::lang_items;
94+
use crate::namespace::Namespace;
9595
use rustc::infer::{self, InferCtxt, InferOk, InferResult, RegionVariableOrigin};
9696
use rustc::infer::canonical::{Canonical, OriginalQueryValues, QueryResponse};
9797
use rustc_data_structures::indexed_vec::Idx;
@@ -130,14 +130,14 @@ use std::mem::replace;
130130
use std::ops::{self, Deref};
131131
use std::slice;
132132

133-
use require_c_abi_if_variadic;
134-
use session::{CompileIncomplete, Session};
135-
use session::config::EntryFnType;
136-
use TypeAndSubsts;
137-
use lint;
138-
use util::captures::Captures;
139-
use util::common::{ErrorReported, indenter};
140-
use util::nodemap::{DefIdMap, DefIdSet, FxHashMap, FxHashSet, NodeMap};
133+
use crate::require_c_abi_if_variadic;
134+
use crate::session::{CompileIncomplete, Session};
135+
use crate::session::config::EntryFnType;
136+
use crate::TypeAndSubsts;
137+
use crate::lint;
138+
use crate::util::captures::Captures;
139+
use crate::util::common::{ErrorReported, indenter};
140+
use crate::util::nodemap::{DefIdMap, DefIdSet, FxHashMap, FxHashSet, NodeMap};
141141

142142
pub use self::Expectation::*;
143143
use self::autoderef::Autoderef;
@@ -3044,7 +3044,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
30443044
// arguments which we skipped above.
30453045
if variadic {
30463046
fn variadic_error<'tcx>(s: &Session, span: Span, t: Ty<'tcx>, cast_ty: &str) {
3047-
use structured_errors::{VariadicError, StructuredDiagnostic};
3047+
use crate::structured_errors::{VariadicError, StructuredDiagnostic};
30483048
VariadicError::new(s, span, t, cast_ty).diagnostic().emit();
30493049
}
30503050

@@ -3685,8 +3685,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
36853685
display
36863686
}
36873687

3688-
fn no_such_field_err<T: Display>(&self, span: Span, field: T, expr_t: &ty::TyS)
3689-
-> DiagnosticBuilder {
3688+
fn no_such_field_err<T: Display>(&self, span: Span, field: T, expr_t: &ty::TyS<'_>)
3689+
-> DiagnosticBuilder<'_> {
36903690
type_error_struct!(self.tcx().sess, span, expr_t, E0609,
36913691
"no field `{}` on type `{}`",
36923692
field, expr_t)
@@ -5257,7 +5257,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
52575257
&self,
52585258
blk: &'gcx hir::Block,
52595259
expected_ty: Ty<'tcx>,
5260-
err: &mut DiagnosticBuilder,
5260+
err: &mut DiagnosticBuilder<'_>,
52615261
) {
52625262
if let Some(span_semi) = self.could_remove_semicolon(blk, expected_ty) {
52635263
err.span_suggestion(
@@ -5725,7 +5725,7 @@ fn fatally_break_rust(sess: &Session) {
57255725
);
57265726
handler.note_without_error(&format!("rustc {} running on {}",
57275727
option_env!("CFG_VERSION").unwrap_or("unknown_version"),
5728-
::session::config::host_triple(),
5728+
crate::session::config::host_triple(),
57295729
));
57305730
}
57315731

‎src/librustc_typeck/check/regionck.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@
7272
//! relation, except that a borrowed pointer never owns its
7373
//! contents.
7474
75-
use check::dropck;
76-
use check::FnCtxt;
77-
use middle::mem_categorization as mc;
78-
use middle::mem_categorization::Categorization;
79-
use middle::region;
75+
use crate::check::dropck;
76+
use crate::check::FnCtxt;
77+
use crate::middle::mem_categorization as mc;
78+
use crate::middle::mem_categorization::Categorization;
79+
use crate::middle::region;
8080
use rustc::hir::def_id::DefId;
8181
use rustc::infer::outlives::env::OutlivesEnvironment;
8282
use rustc::infer::{self, RegionObligation, SuppressRegionErrors};

‎src/librustc_typeck/check/upvar.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
3333
use super::FnCtxt;
3434

35-
use middle::expr_use_visitor as euv;
36-
use middle::mem_categorization as mc;
37-
use middle::mem_categorization::Categorization;
35+
use crate::middle::expr_use_visitor as euv;
36+
use crate::middle::mem_categorization as mc;
37+
use crate::middle::mem_categorization::Categorization;
3838
use rustc::hir;
3939
use rustc::hir::def_id::DefId;
4040
use rustc::hir::def_id::LocalDefId;

‎src/librustc_typeck/check/wfcheck.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use check::{Inherited, FnCtxt};
2-
use constrained_type_params::{identify_constrained_type_params, Parameter};
1+
use crate::check::{Inherited, FnCtxt};
2+
use crate::constrained_type_params::{identify_constrained_type_params, Parameter};
33

4-
use hir::def_id::DefId;
4+
use crate::hir::def_id::DefId;
55
use rustc::traits::{self, ObligationCauseCode};
66
use rustc::ty::{self, Lift, Ty, TyCtxt, TyKind, GenericParamDefKind, TypeFoldable, ToPredicate};
77
use rustc::ty::subst::{Subst, Substs};

‎src/librustc_typeck/check/writeback.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// unresolved type variables and replaces "ty_var" types with their
33
// substitutions.
44

5-
use check::FnCtxt;
5+
use crate::check::FnCtxt;
66
use errors::DiagnosticBuilder;
77
use rustc::hir;
88
use rustc::hir::def_id::{DefId, DefIndex};

‎src/librustc_typeck/check_unused.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use lint;
1+
use crate::lint;
22
use rustc::ty::TyCtxt;
33

44
use errors::Applicability;

‎src/librustc_typeck/coherence/inherent_impls_overlap.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
use namespace::Namespace;
1+
use crate::namespace::Namespace;
22
use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
33
use rustc::hir;
44
use rustc::hir::itemlikevisit::ItemLikeVisitor;
55
use rustc::traits::{self, IntercrateMode};
66
use rustc::ty::TyCtxt;
77

8-
use lint;
8+
use crate::lint;
99

1010
pub fn crate_inherent_impls_overlap_check<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
1111
crate_num: CrateNum) {

‎src/librustc_typeck/coherence/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// done by the orphan and overlap modules. Then we build up various
66
// mappings. That mapping code resides here.
77

8-
use hir::def_id::{DefId, LOCAL_CRATE};
8+
use crate::hir::def_id::{DefId, LOCAL_CRATE};
99
use rustc::traits;
1010
use rustc::ty::{self, TyCtxt, TypeFoldable};
1111
use rustc::ty::query::Providers;

0 commit comments

Comments
 (0)