Skip to content

Commit 6afe9e3

Browse files
committed
rustc_middle: Remove trait DefIdTree
This trait was a way to generalize over both `TyCtxt` and `Resolver`, but now `Resolver` has access to `TyCtxt`, so this trait is no longer necessary.
1 parent 49b9cc5 commit 6afe9e3

File tree

90 files changed

+118
-154
lines changed

Some content is hidden

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

90 files changed

+118
-154
lines changed

compiler/rustc_ast_lowering/src/item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_hir::def::{DefKind, Res};
1313
use rustc_hir::def_id::{LocalDefId, CRATE_DEF_ID};
1414
use rustc_hir::PredicateOrigin;
1515
use rustc_index::vec::{Idx, IndexVec};
16-
use rustc_middle::ty::{DefIdTree, ResolverAstLowering, TyCtxt};
16+
use rustc_middle::ty::{ResolverAstLowering, TyCtxt};
1717
use rustc_span::edit_distance::find_best_match_for_name;
1818
use rustc_span::source_map::DesugaringKind;
1919
use rustc_span::symbol::{kw, sym, Ident};

compiler/rustc_borrowck/src/diagnostics/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_middle::mir::{
1313
Place, PlaceRef, ProjectionElem, Rvalue, Statement, StatementKind, Terminator, TerminatorKind,
1414
};
1515
use rustc_middle::ty::print::Print;
16-
use rustc_middle::ty::{self, DefIdTree, Instance, Ty, TyCtxt};
16+
use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
1717
use rustc_mir_dataflow::move_paths::{InitLocation, LookupResult};
1818
use rustc_span::def_id::LocalDefId;
1919
use rustc_span::{symbol::sym, Span, Symbol, DUMMY_SP};

compiler/rustc_borrowck/src/diagnostics/region_name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_hir as hir;
66
use rustc_hir::def::{DefKind, Res};
77
use rustc_middle::ty::print::RegionHighlightMode;
88
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef};
9-
use rustc_middle::ty::{self, DefIdTree, RegionVid, Ty};
9+
use rustc_middle::ty::{self, RegionVid, Ty};
1010
use rustc_span::symbol::{kw, sym, Ident, Symbol};
1111
use rustc_span::{Span, DUMMY_SP};
1212

compiler/rustc_borrowck/src/universal_regions.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ use rustc_hir::{BodyOwnerKind, HirId};
2222
use rustc_index::vec::{Idx, IndexVec};
2323
use rustc_infer::infer::NllRegionVariableOrigin;
2424
use rustc_middle::ty::fold::TypeFoldable;
25-
use rustc_middle::ty::{
26-
self, DefIdTree, InlineConstSubsts, InlineConstSubstsParts, RegionVid, Ty, TyCtxt,
27-
};
25+
use rustc_middle::ty::{self, InlineConstSubsts, InlineConstSubstsParts, RegionVid, Ty, TyCtxt};
2826
use rustc_middle::ty::{InternalSubsts, SubstsRef};
2927
use rustc_span::Symbol;
3028
use std::iter;

compiler/rustc_codegen_llvm/src/debuginfo/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use super::CodegenUnitDebugContext;
55

66
use rustc_hir::def_id::DefId;
77
use rustc_middle::ty::layout::{HasParamEnv, LayoutOf};
8-
use rustc_middle::ty::{self, DefIdTree, Ty};
8+
use rustc_middle::ty::{self, Ty};
99
use trace;
1010

1111
use crate::common::CodegenCx;

compiler/rustc_codegen_ssa/src/back/symbol_export.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_middle::middle::exported_symbols::{
1111
use rustc_middle::ty::query::{ExternProviders, Providers};
1212
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef};
1313
use rustc_middle::ty::Instance;
14-
use rustc_middle::ty::{self, DefIdTree, SymbolName, TyCtxt};
14+
use rustc_middle::ty::{self, SymbolName, TyCtxt};
1515
use rustc_session::config::{CrateType, OomStrategy};
1616
use rustc_target::spec::SanitizerSet;
1717

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_hir::{lang_items, weak_lang_items::WEAK_LANG_ITEMS, LangItem};
88
use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
99
use rustc_middle::mir::mono::Linkage;
1010
use rustc_middle::ty::query::Providers;
11-
use rustc_middle::ty::{self as ty, DefIdTree, TyCtxt};
11+
use rustc_middle::ty::{self as ty, TyCtxt};
1212
use rustc_session::{lint, parse::feature_err};
1313
use rustc_span::{sym, Span};
1414
use rustc_target::spec::{abi, SanitizerSet};

compiler/rustc_codegen_ssa/src/target_features.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_hir::def_id::DefId;
88
use rustc_hir::def_id::LocalDefId;
99
use rustc_hir::def_id::LOCAL_CRATE;
1010
use rustc_middle::ty::query::Providers;
11-
use rustc_middle::ty::{DefIdTree, TyCtxt};
11+
use rustc_middle::ty::TyCtxt;
1212
use rustc_session::parse::feature_err;
1313
use rustc_session::Session;
1414
use rustc_span::symbol::sym;

compiler/rustc_const_eval/src/const_eval/fn_queries.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use rustc_hir as hir;
22
use rustc_hir::def::DefKind;
33
use rustc_hir::def_id::{DefId, LocalDefId};
44
use rustc_middle::ty::query::Providers;
5-
use rustc_middle::ty::{DefIdTree, TyCtxt};
5+
use rustc_middle::ty::TyCtxt;
66
use rustc_span::symbol::Symbol;
77

88
/// Whether the `def_id` is an unstable const fn and what feature gate is necessary to enable it

compiler/rustc_const_eval/src/transform/check_consts/ops.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ use rustc_infer::traits::{ImplSource, Obligation, ObligationCause};
1212
use rustc_middle::mir;
1313
use rustc_middle::ty::print::with_no_trimmed_paths;
1414
use rustc_middle::ty::subst::{GenericArgKind, SubstsRef};
15-
use rustc_middle::ty::{
16-
suggest_constraining_type_param, Adt, Closure, DefIdTree, FnDef, FnPtr, Param, Ty,
17-
};
15+
use rustc_middle::ty::{suggest_constraining_type_param, Adt, Closure, FnDef, FnPtr, Param, Ty};
1816
use rustc_middle::ty::{Binder, TraitRef};
1917
use rustc_session::parse::feature_err;
2018
use rustc_span::symbol::sym;

0 commit comments

Comments
 (0)