Skip to content

Commit 95da425

Browse files
authored
Rollup merge of #79212 - LeSeulArtichaut:rustc-ty, r=jonas-schievink
Move `rustc_ty` -> `rustc_ty_utils` Implements MCP rust-lang/compiler-team#387. r? `@jonas-schievink`
2 parents 39495cb + f59d030 commit 95da425

File tree

11 files changed

+7
-7
lines changed

11 files changed

+7
-7
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -3802,7 +3802,7 @@ dependencies = [
38023802
"rustc_target",
38033803
"rustc_trait_selection",
38043804
"rustc_traits",
3805-
"rustc_ty",
3805+
"rustc_ty_utils",
38063806
"rustc_typeck",
38073807
"smallvec 1.4.2",
38083808
"tempfile",
@@ -4240,7 +4240,7 @@ dependencies = [
42404240
]
42414241

42424242
[[package]]
4243-
name = "rustc_ty"
4243+
name = "rustc_ty_utils"
42444244
version = "0.0.0"
42454245
dependencies = [
42464246
"rustc_data_structures",

compiler/rustc_infer/src/infer/error_reporting/nice_region_error/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
131131
}
132132

133133
pub(super) fn asyncness(&self, local_def_id: LocalDefId) -> Option<hir::IsAsync> {
134-
// similar to the asyncness fn in rustc_ty::ty
134+
// similar to the asyncness fn in rustc_ty_utils::ty
135135
let hir_id = self.tcx().hir().local_def_id_to_hir_id(local_def_id);
136136
let node = self.tcx().hir().get(hir_id);
137137
let fn_like = rustc_middle::hir::map::blocks::FnLikeNode::from_node(node)?;

compiler/rustc_interface/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ rustc_plugin_impl = { path = "../rustc_plugin_impl" }
4141
rustc_privacy = { path = "../rustc_privacy" }
4242
rustc_resolve = { path = "../rustc_resolve" }
4343
rustc_trait_selection = { path = "../rustc_trait_selection" }
44-
rustc_ty = { path = "../rustc_ty" }
44+
rustc_ty_utils = { path = "../rustc_ty_utils" }
4545
tempfile = "3.0.5"
4646

4747
[target.'cfg(windows)'.dependencies]

compiler/rustc_interface/src/passes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ pub static DEFAULT_QUERY_PROVIDERS: SyncLazy<Providers> = SyncLazy::new(|| {
699699
rustc_passes::provide(providers);
700700
rustc_resolve::provide(providers);
701701
rustc_traits::provide(providers);
702-
rustc_ty::provide(providers);
702+
rustc_ty_utils::provide(providers);
703703
rustc_metadata::provide(providers);
704704
rustc_lint::provide(providers);
705705
rustc_symbol_mangling::provide(providers);

compiler/rustc_trait_selection/src/traits/project.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ fn assemble_candidates_from_impls<'cx, 'tcx>(
997997
// type.
998998
//
999999
// NOTE: This should be kept in sync with the similar code in
1000-
// `rustc_ty::instance::resolve_associated_item()`.
1000+
// `rustc_ty_utils::instance::resolve_associated_item()`.
10011001
let node_item =
10021002
assoc_ty_def(selcx, impl_data.impl_def_id, obligation.predicate.item_def_id)
10031003
.map_err(|ErrorReported| ())?;

compiler/rustc_ty/Cargo.toml compiler/rustc_ty_utils/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
authors = ["The Rust Project Developers"]
3-
name = "rustc_ty"
3+
name = "rustc_ty_utils"
44
version = "0.0.0"
55
edition = "2018"
66

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)