Skip to content

Commit 2519f4a

Browse files
cjgillotcjgillot
committed
Make librustc_traits compile.
1 parent 1637aab commit 2519f4a

File tree

9 files changed

+51
-45
lines changed

9 files changed

+51
-45
lines changed

‎src/librustc_traits/chalk_context/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ mod unify;
55
use chalk_engine::fallible::Fallible;
66
use chalk_engine::forest::Forest;
77
use chalk_engine::{context, hh::HhGoal, DelayedLiteral, ExClause, Literal};
8-
use rustc::infer::canonical::{
8+
use rustc::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
9+
use rustc::ty::query::Providers;
10+
use rustc::ty::subst::{GenericArg, GenericArgKind};
11+
use rustc::ty::{self, TyCtxt};
12+
use rustc_infer::infer::canonical::{
913
Canonical, CanonicalVarValues, Certainty, OriginalQueryValues, QueryRegionConstraints,
1014
QueryResponse,
1115
};
12-
use rustc::infer::{InferCtxt, LateBoundRegionConversionTime};
13-
use rustc::traits::{
16+
use rustc_infer::infer::{InferCtxt, LateBoundRegionConversionTime, TyCtxtInferExt};
17+
use rustc_infer::traits::{
1418
self, ChalkCanonicalGoal, ChalkContextLift, Clause, DomainGoal, Environment, ExClauseFold,
1519
Goal, GoalKind, InEnvironment, QuantifierKind,
1620
};
17-
use rustc::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
18-
use rustc::ty::query::Providers;
19-
use rustc::ty::subst::{GenericArg, GenericArgKind};
20-
use rustc::ty::{self, TyCtxt};
2121
use rustc_macros::{Lift, TypeFoldable};
2222
use rustc_span::DUMMY_SP;
2323

‎src/librustc_traits/chalk_context/resolvent_ops.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use chalk_engine::fallible::{Fallible, NoSolution};
22
use chalk_engine::{context, ExClause, Literal};
3-
use rustc::infer::canonical::{Canonical, CanonicalVarValues};
4-
use rustc::infer::{InferCtxt, LateBoundRegionConversionTime};
5-
use rustc::traits::{
6-
Clause, DomainGoal, Environment, Goal, GoalKind, InEnvironment, ProgramClause, WhereClause,
7-
};
83
use rustc::ty::relate::{Relate, RelateResult, TypeRelation};
94
use rustc::ty::subst::GenericArg;
105
use rustc::ty::{self, Ty, TyCtxt};
6+
use rustc_infer::infer::canonical::{Canonical, CanonicalVarValues};
7+
use rustc_infer::infer::{InferCtxt, LateBoundRegionConversionTime};
8+
use rustc_infer::traits::{
9+
Clause, DomainGoal, Environment, Goal, GoalKind, InEnvironment, ProgramClause, WhereClause,
10+
};
1111
use rustc_span::DUMMY_SP;
1212

1313
use super::unify::*;

‎src/librustc_traits/chalk_context/unify.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use rustc::infer::nll_relate::{NormalizationStrategy, TypeRelating, TypeRelatingDelegate};
2-
use rustc::infer::{InferCtxt, RegionVariableOrigin};
3-
use rustc::traits::{DomainGoal, Environment, Goal, InEnvironment};
41
use rustc::ty;
52
use rustc::ty::relate::{Relate, RelateResult, TypeRelation};
3+
use rustc_infer::infer::nll_relate::{NormalizationStrategy, TypeRelating, TypeRelatingDelegate};
4+
use rustc_infer::infer::{InferCtxt, RegionVariableOrigin};
5+
use rustc_infer::traits::{DomainGoal, Environment, Goal, InEnvironment};
66
use rustc_span::DUMMY_SP;
77

88
crate struct UnificationResult<'tcx> {

‎src/librustc_traits/dropck_outlives.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
use rustc::infer::canonical::{Canonical, QueryResponse};
2-
use rustc::traits::query::dropck_outlives::trivial_dropck_outlives;
3-
use rustc::traits::query::dropck_outlives::{DropckOutlivesResult, DtorckConstraint};
4-
use rustc::traits::query::{CanonicalTyGoal, NoSolution};
5-
use rustc::traits::{Normalized, ObligationCause, TraitEngine, TraitEngineExt};
61
use rustc::ty::query::Providers;
72
use rustc::ty::subst::{InternalSubsts, Subst};
83
use rustc::ty::{self, ParamEnvAnd, Ty, TyCtxt};
94
use rustc_data_structures::fx::FxHashSet;
105
use rustc_hir::def_id::DefId;
6+
use rustc_infer::infer::canonical::{Canonical, QueryResponse};
7+
use rustc_infer::infer::TyCtxtInferExt;
8+
use rustc_infer::traits::query::dropck_outlives::trivial_dropck_outlives;
9+
use rustc_infer::traits::query::dropck_outlives::{DropckOutlivesResult, DtorckConstraint};
10+
use rustc_infer::traits::query::{CanonicalTyGoal, NoSolution};
11+
use rustc_infer::traits::{Normalized, ObligationCause, TraitEngine, TraitEngineExt};
1112
use rustc_span::source_map::{Span, DUMMY_SP};
1213

1314
crate fn provide(p: &mut Providers<'_>) {

‎src/librustc_traits/evaluate_obligation.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
use rustc::traits::query::CanonicalPredicateGoal;
2-
use rustc::traits::{
3-
EvaluationResult, Obligation, ObligationCause, OverflowError, SelectionContext, TraitQueryMode,
4-
};
51
use rustc::ty::query::Providers;
62
use rustc::ty::{ParamEnvAnd, TyCtxt};
3+
use rustc_infer::infer::TyCtxtInferExt;
4+
use rustc_infer::traits::query::CanonicalPredicateGoal;
5+
use rustc_infer::traits::{
6+
EvaluationResult, Obligation, ObligationCause, OverflowError, SelectionContext, TraitQueryMode,
7+
};
78
use rustc_span::source_map::DUMMY_SP;
89

910
crate fn provide(p: &mut Providers<'_>) {

‎src/librustc_traits/implied_outlives_bounds.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
//! Provider for the `implied_outlives_bounds` query.
22
//! Do not call this query directory. See [`rustc::traits::query::implied_outlives_bounds`].
33
4-
use rustc::infer::canonical::{self, Canonical};
5-
use rustc::infer::InferCtxt;
6-
use rustc::traits::query::outlives_bounds::OutlivesBound;
7-
use rustc::traits::query::{CanonicalTyGoal, Fallible, NoSolution};
8-
use rustc::traits::wf;
9-
use rustc::traits::FulfillmentContext;
10-
use rustc::traits::{TraitEngine, TraitEngineExt};
114
use rustc::ty::outlives::Component;
125
use rustc::ty::query::Providers;
136
use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
147
use rustc_hir as hir;
8+
use rustc_infer::infer::canonical::{self, Canonical};
9+
use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
10+
use rustc_infer::traits::query::outlives_bounds::OutlivesBound;
11+
use rustc_infer::traits::query::{CanonicalTyGoal, Fallible, NoSolution};
12+
use rustc_infer::traits::wf;
13+
use rustc_infer::traits::FulfillmentContext;
14+
use rustc_infer::traits::{TraitEngine, TraitEngineExt};
1515
use rustc_span::source_map::DUMMY_SP;
1616
use smallvec::{smallvec, SmallVec};
1717

‎src/librustc_traits/normalize_erasing_regions.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
use rustc::traits::query::NoSolution;
2-
use rustc::traits::{Normalized, ObligationCause};
32
use rustc::ty::query::Providers;
43
use rustc::ty::{self, ParamEnvAnd, Ty, TyCtxt};
4+
use rustc_infer::infer::TyCtxtInferExt;
5+
use rustc_infer::traits::{Normalized, ObligationCause};
56
use std::sync::atomic::Ordering;
67

78
crate fn provide(p: &mut Providers<'_>) {

‎src/librustc_traits/normalize_projection_ty.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
use rustc::infer::canonical::{Canonical, QueryResponse};
2-
use rustc::traits::query::{normalize::NormalizationResult, CanonicalProjectionGoal, NoSolution};
3-
use rustc::traits::{self, ObligationCause, SelectionContext, TraitEngineExt};
41
use rustc::ty::query::Providers;
52
use rustc::ty::{ParamEnvAnd, TyCtxt};
63
use rustc_hir as hir;
4+
use rustc_infer::infer::canonical::{Canonical, QueryResponse};
5+
use rustc_infer::infer::TyCtxtInferExt;
6+
use rustc_infer::traits::query::{
7+
normalize::NormalizationResult, CanonicalProjectionGoal, NoSolution,
8+
};
9+
use rustc_infer::traits::{self, ObligationCause, SelectionContext, TraitEngineExt};
710
use rustc_span::DUMMY_SP;
811
use std::sync::atomic::Ordering;
912

‎src/librustc_traits/type_op.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
use rustc::infer::at::ToTrace;
2-
use rustc::infer::canonical::{Canonical, QueryResponse};
3-
use rustc::infer::InferCtxt;
4-
use rustc::traits::query::type_op::ascribe_user_type::AscribeUserType;
5-
use rustc::traits::query::type_op::eq::Eq;
6-
use rustc::traits::query::type_op::normalize::Normalize;
7-
use rustc::traits::query::type_op::prove_predicate::ProvePredicate;
8-
use rustc::traits::query::type_op::subtype::Subtype;
9-
use rustc::traits::query::{Fallible, NoSolution};
10-
use rustc::traits::{Normalized, Obligation, ObligationCause, TraitEngine, TraitEngineExt};
111
use rustc::ty::query::Providers;
122
use rustc::ty::subst::{GenericArg, Subst, UserSelfTy, UserSubsts};
133
use rustc::ty::{
144
FnSig, Lift, ParamEnv, ParamEnvAnd, PolyFnSig, Predicate, Ty, TyCtxt, TypeFoldable, Variance,
155
};
166
use rustc_hir as hir;
177
use rustc_hir::def_id::DefId;
8+
use rustc_infer::infer::at::ToTrace;
9+
use rustc_infer::infer::canonical::{Canonical, QueryResponse};
10+
use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
11+
use rustc_infer::traits::query::type_op::ascribe_user_type::AscribeUserType;
12+
use rustc_infer::traits::query::type_op::eq::Eq;
13+
use rustc_infer::traits::query::type_op::normalize::Normalize;
14+
use rustc_infer::traits::query::type_op::prove_predicate::ProvePredicate;
15+
use rustc_infer::traits::query::type_op::subtype::Subtype;
16+
use rustc_infer::traits::query::{Fallible, NoSolution};
17+
use rustc_infer::traits::{Normalized, Obligation, ObligationCause, TraitEngine, TraitEngineExt};
1818
use rustc_span::DUMMY_SP;
1919
use std::fmt;
2020

0 commit comments

Comments
 (0)