Skip to content

Commit 66c0023

Browse files
committed
Make downstream crates compile.
1 parent 82816fc commit 66c0023

Some content is hidden

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

52 files changed

+136
-83
lines changed

src/librustc_interface/passes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use rustc_errors::PResult;
2727
use rustc_expand::base::ExtCtxt;
2828
use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
2929
use rustc_hir::Crate;
30-
use rustc_infer::traits;
3130
use rustc_lint::LintStore;
3231
use rustc_mir as mir;
3332
use rustc_mir_build as mir_build;
@@ -37,6 +36,7 @@ use rustc_plugin_impl as plugin;
3736
use rustc_resolve::{Resolver, ResolverArenas};
3837
use rustc_span::symbol::Symbol;
3938
use rustc_span::FileName;
39+
use rustc_trait_selection::traits;
4040
use rustc_typeck as typeck;
4141

4242
use rustc_serialize::json;

src/librustc_lint/builtin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ use rustc_hir::def::{DefKind, Res};
3939
use rustc_hir::def_id::DefId;
4040
use rustc_hir::{GenericParamKind, PatKind};
4141
use rustc_hir::{HirIdSet, Node};
42-
use rustc_infer::traits::misc::can_type_implement_copy;
4342
use rustc_session::lint::FutureIncompatibleInfo;
4443
use rustc_span::edition::Edition;
4544
use rustc_span::source_map::Spanned;
4645
use rustc_span::symbol::{kw, sym, Symbol};
4746
use rustc_span::{BytePos, Span};
47+
use rustc_trait_selection::traits::misc::can_type_implement_copy;
4848

4949
use crate::nonstandard_style::{method_context, MethodLateContext};
5050

src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ use rustc_hir as hir;
1010
use rustc_hir::def_id::DefId;
1111
use rustc_hir::{AsyncGeneratorKind, GeneratorKind};
1212
use rustc_index::vec::Idx;
13-
use rustc_infer::traits::error_reporting::suggest_constraining_type_param;
1413
use rustc_span::source_map::DesugaringKind;
1514
use rustc_span::Span;
15+
use rustc_trait_selection::traits::error_reporting::suggest_constraining_type_param;
1616

1717
use crate::dataflow::drop_flag_effects;
1818
use crate::dataflow::indexes::{MoveOutIndex, MovePathIndex};

src/librustc_mir/borrow_check/region_infer/opaque_types.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use rustc_data_structures::fx::FxHashMap;
33
use rustc_hir::def_id::DefId;
44
use rustc_infer::infer::InferCtxt;
55
use rustc_span::Span;
6+
use rustc_trait_selection::opaque_types::InferCtxtExt;
67

78
use super::RegionInferenceContext;
89

src/librustc_mir/borrow_check/type_check/free_region_relations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use rustc_infer::infer::canonical::QueryRegionConstraints;
77
use rustc_infer::infer::outlives;
88
use rustc_infer::infer::region_constraints::GenericKind;
99
use rustc_infer::infer::InferCtxt;
10-
use rustc_infer::traits::query::type_op::{self, TypeOp};
1110
use rustc_span::DUMMY_SP;
11+
use rustc_trait_selection::traits::query::type_op::{self, TypeOp};
1212
use std::rc::Rc;
1313

1414
use crate::borrow_check::{

src/librustc_mir/borrow_check/type_check/liveness/trace.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ use rustc::ty::{Ty, TypeFoldable};
33
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
44
use rustc_index::bit_set::HybridBitSet;
55
use rustc_infer::infer::canonical::QueryRegionConstraints;
6-
use rustc_infer::traits::query::dropck_outlives::DropckOutlivesResult;
7-
use rustc_infer::traits::query::type_op::outlives::DropckOutlives;
8-
use rustc_infer::traits::query::type_op::TypeOp;
6+
use rustc_trait_selection::traits::query::dropck_outlives::DropckOutlivesResult;
7+
use rustc_trait_selection::traits::query::type_op::outlives::DropckOutlives;
8+
use rustc_trait_selection::traits::query::type_op::TypeOp;
99
use std::rc::Rc;
1010

1111
use crate::dataflow::generic::ResultsCursor;

src/librustc_mir/borrow_check/type_check/mod.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,19 @@ use rustc_hir as hir;
2424
use rustc_hir::def_id::DefId;
2525
use rustc_index::vec::{Idx, IndexVec};
2626
use rustc_infer::infer::canonical::QueryRegionConstraints;
27-
use rustc_infer::infer::opaque_types::GenerateMemberConstraints;
2827
use rustc_infer::infer::outlives::env::RegionBoundPairs;
2928
use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
3029
use rustc_infer::infer::{
3130
InferCtxt, InferOk, LateBoundRegionConversionTime, NLLRegionVariableOrigin,
3231
};
33-
use rustc_infer::traits::query::type_op;
34-
use rustc_infer::traits::query::type_op::custom::CustomTypeOp;
35-
use rustc_infer::traits::query::{Fallible, NoSolution};
36-
use rustc_infer::traits::{self, ObligationCause, PredicateObligations};
3732
use rustc_span::{Span, DUMMY_SP};
33+
use rustc_trait_selection::infer::InferCtxtExt as _;
34+
use rustc_trait_selection::opaque_types::{GenerateMemberConstraints, InferCtxtExt};
35+
use rustc_trait_selection::traits::error_reporting::InferCtxtExt as _;
36+
use rustc_trait_selection::traits::query::type_op;
37+
use rustc_trait_selection::traits::query::type_op::custom::CustomTypeOp;
38+
use rustc_trait_selection::traits::query::{Fallible, NoSolution};
39+
use rustc_trait_selection::traits::{self, ObligationCause, PredicateObligations};
3840

3941
use crate::dataflow::generic::ResultsCursor;
4042
use crate::dataflow::move_paths::MoveData;

src/librustc_mir/borrow_check/type_check/relate_tys.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use rustc::ty::relate::TypeRelation;
33
use rustc::ty::{self, Ty};
44
use rustc_infer::infer::nll_relate::{NormalizationStrategy, TypeRelating, TypeRelatingDelegate};
55
use rustc_infer::infer::{InferCtxt, NLLRegionVariableOrigin};
6-
use rustc_infer::traits::query::Fallible;
7-
use rustc_infer::traits::DomainGoal;
6+
use rustc_trait_selection::traits::query::Fallible;
7+
use rustc_trait_selection::traits::DomainGoal;
88

99
use crate::borrow_check::constraints::OutlivesConstraint;
1010
use crate::borrow_check::type_check::{BorrowCheckContext, Locations};

src/librustc_mir/transform/check_consts/validation.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ use rustc_errors::struct_span_err;
99
use rustc_hir::{def_id::DefId, HirId};
1010
use rustc_index::bit_set::BitSet;
1111
use rustc_infer::infer::TyCtxtInferExt;
12-
use rustc_infer::traits::{self, TraitEngine};
1312
use rustc_span::symbol::sym;
1413
use rustc_span::Span;
14+
use rustc_trait_selection::traits::error_reporting::InferCtxtExt;
15+
use rustc_trait_selection::traits::{self, TraitEngine};
1516

1617
use std::borrow::Cow;
1718
use std::ops::Deref;

src/librustc_mir/transform/const_prop.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ use rustc_data_structures::fx::FxHashMap;
2525
use rustc_hir::def::DefKind;
2626
use rustc_hir::HirId;
2727
use rustc_index::vec::IndexVec;
28-
use rustc_infer::traits;
2928
use rustc_span::Span;
29+
use rustc_trait_selection::traits;
3030

3131
use crate::const_eval::error_to_const_error;
3232
use crate::interpret::{

0 commit comments

Comments
 (0)