Skip to content

Commit 795673a

Browse files
committed
Remove librustc_infer crate re-exports.
1 parent bee6a5a commit 795673a

Some content is hidden

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

61 files changed

+150
-156
lines changed

src/librustc_infer/infer/at.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
2828
use super::*;
2929

30-
use crate::ty::relate::{Relate, TypeRelation};
31-
use crate::ty::Const;
30+
use rustc::ty::relate::{Relate, TypeRelation};
31+
use rustc::ty::Const;
3232

3333
pub struct At<'a, 'tcx> {
3434
pub infcx: &'a InferCtxt<'a, 'tcx>,

src/librustc_infer/infer/canonical/canonicalizer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ use crate::infer::canonical::{
1010
OriginalQueryValues,
1111
};
1212
use crate::infer::InferCtxt;
13-
use crate::ty::flags::FlagComputation;
14-
use crate::ty::fold::{TypeFoldable, TypeFolder};
15-
use crate::ty::subst::GenericArg;
16-
use crate::ty::{self, BoundVar, InferConst, List, Ty, TyCtxt, TypeFlags};
13+
use rustc::ty::flags::FlagComputation;
14+
use rustc::ty::fold::{TypeFoldable, TypeFolder};
15+
use rustc::ty::subst::GenericArg;
16+
use rustc::ty::{self, BoundVar, InferConst, List, Ty, TyCtxt, TypeFlags};
1717
use std::sync::atomic::Ordering;
1818

1919
use rustc_data_structures::fx::FxHashMap;

src/librustc_infer/infer/canonical/query_response.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//!
88
//! [c]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
99
10-
use crate::arena::ArenaAllocatable;
1110
use crate::infer::canonical::substitute::{substitute_value, CanonicalExt};
1211
use crate::infer::canonical::{
1312
Canonical, CanonicalVarValues, CanonicalizedQueryResponse, Certainty, OriginalQueryValues,
@@ -19,6 +18,7 @@ use crate::infer::{InferCtxt, InferOk, InferResult};
1918
use crate::traits::query::{Fallible, NoSolution};
2019
use crate::traits::TraitEngine;
2120
use crate::traits::{Obligation, ObligationCause, PredicateObligation};
21+
use rustc::arena::ArenaAllocatable;
2222
use rustc::ty::fold::TypeFoldable;
2323
use rustc::ty::subst::{GenericArg, GenericArgKind};
2424
use rustc::ty::{self, BoundVar, Ty, TyCtxt};

src/librustc_infer/infer/canonical/substitute.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
//! [c]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
88
99
use crate::infer::canonical::{Canonical, CanonicalVarValues};
10-
use crate::ty::fold::TypeFoldable;
11-
use crate::ty::subst::GenericArgKind;
12-
use crate::ty::{self, TyCtxt};
10+
use rustc::ty::fold::TypeFoldable;
11+
use rustc::ty::subst::GenericArgKind;
12+
use rustc::ty::{self, TyCtxt};
1313

1414
pub(super) trait CanonicalExt<'tcx, V> {
1515
/// Instantiate the wrapped value, replacing each canonical value

src/librustc_infer/infer/combine.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ use super::unify_key::{ConstVariableOrigin, ConstVariableOriginKind};
3333
use super::{InferCtxt, MiscVariable, TypeTrace};
3434

3535
use crate::traits::{Obligation, PredicateObligations};
36-
use crate::ty::error::TypeError;
37-
use crate::ty::relate::{self, Relate, RelateResult, TypeRelation};
38-
use crate::ty::subst::SubstsRef;
39-
use crate::ty::{self, InferConst, Ty, TyCtxt};
40-
use crate::ty::{IntType, UintType};
4136

37+
use rustc::ty::error::TypeError;
38+
use rustc::ty::relate::{self, Relate, RelateResult, TypeRelation};
39+
use rustc::ty::subst::SubstsRef;
40+
use rustc::ty::{self, InferConst, Ty, TyCtxt};
41+
use rustc::ty::{IntType, UintType};
4242
use rustc_hir::def_id::DefId;
4343
use rustc_span::{Span, DUMMY_SP};
4444
use syntax::ast;

src/librustc_infer/infer/equate.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use super::combine::{CombineFields, RelationDir};
22
use super::Subtype;
33

4-
use crate::ty::relate::{self, Relate, RelateResult, TypeRelation};
5-
use crate::ty::subst::SubstsRef;
6-
use crate::ty::TyVar;
7-
use crate::ty::{self, Ty, TyCtxt};
4+
use rustc::ty::relate::{self, Relate, RelateResult, TypeRelation};
5+
use rustc::ty::subst::SubstsRef;
6+
use rustc::ty::TyVar;
7+
use rustc::ty::{self, Ty, TyCtxt};
88

99
use rustc_hir::def_id::DefId;
1010

src/librustc_infer/infer/error_reporting/need_type_info.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use crate::hir::map::Map;
21
use crate::infer::type_variable::TypeVariableOriginKind;
32
use crate::infer::InferCtxt;
4-
use crate::ty::print::Print;
5-
use crate::ty::{self, DefIdTree, Infer, Ty, TyVar};
3+
use rustc::hir::map::Map;
4+
use rustc::ty::print::Print;
5+
use rustc::ty::{self, DefIdTree, Infer, Ty, TyVar};
66
use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
77
use rustc_hir as hir;
88
use rustc_hir::def::{DefKind, Namespace};

src/librustc_infer/infer/error_reporting/nice_region_error/different_lifetimes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
use crate::infer::error_reporting::nice_region_error::util::AnonymousParamInfo;
55
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
6-
use crate::util::common::ErrorReported;
6+
use rustc::util::common::ErrorReported;
77

88
use rustc_errors::struct_span_err;
99

src/librustc_infer/infer/error_reporting/nice_region_error/find_anon_type.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use crate::hir::map::Map;
21
use crate::infer::error_reporting::nice_region_error::NiceRegionError;
3-
use crate::middle::resolve_lifetime as rl;
4-
use crate::ty::{self, Region, TyCtxt};
2+
use rustc::hir::map::Map;
3+
use rustc::middle::resolve_lifetime as rl;
4+
use rustc::ty::{self, Region, TyCtxt};
55
use rustc_hir as hir;
66
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
77
use rustc_hir::Node;

src/librustc_infer/infer/error_reporting/nice_region_error/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::infer::lexical_region_resolve::RegionResolutionError;
22
use crate::infer::lexical_region_resolve::RegionResolutionError::*;
33
use crate::infer::InferCtxt;
4-
use crate::ty::{self, TyCtxt};
5-
use crate::util::common::ErrorReported;
4+
use rustc::ty::{self, TyCtxt};
5+
use rustc::util::common::ErrorReported;
66
use rustc_errors::DiagnosticBuilder;
77
use rustc_span::source_map::Span;
88

0 commit comments

Comments
 (0)