Rollup merge of rust-lang#79212 - LeSeulArtichaut:rustc-ty, r=jonas-s…

…chievink Move `rustc_ty` -> `rustc_ty_utils` Implements MCP rust-lang/compiler-team#387. r? `@jonas-schievink`
Dylan-DPC-zz · Nov 19, 2020 · 95da425 · 95da425
2 parents 39495cb + f59d030
commit 95da425
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -3802,7 +3802,7 @@ dependencies = [
  "rustc_target",
  "rustc_trait_selection",
  "rustc_traits",
- "rustc_ty",
+ "rustc_ty_utils",
  "rustc_typeck",
  "smallvec 1.4.2",
  "tempfile",
@@ -4240,7 +4240,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustc_ty"
+name = "rustc_ty_utils"
 version = "0.0.0"
 dependencies = [
  "rustc_data_structures",

diff --git a/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/util.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/util.rs
@@ -131,7 +131,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
     }
 
     pub(super) fn asyncness(&self, local_def_id: LocalDefId) -> Option<hir::IsAsync> {
-        // similar to the asyncness fn in rustc_ty::ty
+        // similar to the asyncness fn in rustc_ty_utils::ty
         let hir_id = self.tcx().hir().local_def_id_to_hir_id(local_def_id);
         let node = self.tcx().hir().get(hir_id);
         let fn_like = rustc_middle::hir::map::blocks::FnLikeNode::from_node(node)?;

diff --git a/compiler/rustc_interface/Cargo.toml b/compiler/rustc_interface/Cargo.toml
@@ -41,7 +41,7 @@ rustc_plugin_impl = { path = "../rustc_plugin_impl" }
 rustc_privacy = { path = "../rustc_privacy" }
 rustc_resolve = { path = "../rustc_resolve" }
 rustc_trait_selection = { path = "../rustc_trait_selection" }
-rustc_ty = { path = "../rustc_ty" }
+rustc_ty_utils = { path = "../rustc_ty_utils" }
 tempfile = "3.0.5"
 
 [target.'cfg(windows)'.dependencies]

diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs
@@ -699,7 +699,7 @@ pub static DEFAULT_QUERY_PROVIDERS: SyncLazy<Providers> = SyncLazy::new(|| {
     rustc_passes::provide(providers);
     rustc_resolve::provide(providers);
     rustc_traits::provide(providers);
-    rustc_ty::provide(providers);
+    rustc_ty_utils::provide(providers);
     rustc_metadata::provide(providers);
     rustc_lint::provide(providers);
     rustc_symbol_mangling::provide(providers);

diff --git a/compiler/rustc_trait_selection/src/traits/project.rs b/compiler/rustc_trait_selection/src/traits/project.rs
@@ -997,7 +997,7 @@ fn assemble_candidates_from_impls<'cx, 'tcx>(
                 // type.
                 //
                 // NOTE: This should be kept in sync with the similar code in
-                // `rustc_ty::instance::resolve_associated_item()`.
+                // `rustc_ty_utils::instance::resolve_associated_item()`.
                 let node_item =
                     assoc_ty_def(selcx, impl_data.impl_def_id, obligation.predicate.item_def_id)
                         .map_err(|ErrorReported| ())?;

diff --git a/compiler/rustc_ty/Cargo.toml → compiler/rustc_ty_utils/Cargo.toml b/compiler/rustc_ty/Cargo.toml → compiler/rustc_ty_utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 authors = ["The Rust Project Developers"]
-name = "rustc_ty"
+name = "rustc_ty_utils"
 version = "0.0.0"
 edition = "2018"
 

diff --git a/compiler/rustc_ty/src/common_traits.rs → compiler/rustc_ty_utils/src/common_traits.rs b/compiler/rustc_ty/src/common_traits.rs → compiler/rustc_ty_utils/src/common_traits.rs
diff --git a/compiler/rustc_ty/src/instance.rs → compiler/rustc_ty_utils/src/instance.rs b/compiler/rustc_ty/src/instance.rs → compiler/rustc_ty_utils/src/instance.rs
diff --git a/compiler/rustc_ty/src/lib.rs → compiler/rustc_ty_utils/src/lib.rs b/compiler/rustc_ty/src/lib.rs → compiler/rustc_ty_utils/src/lib.rs
diff --git a/compiler/rustc_ty/src/needs_drop.rs → compiler/rustc_ty_utils/src/needs_drop.rs b/compiler/rustc_ty/src/needs_drop.rs → compiler/rustc_ty_utils/src/needs_drop.rs
diff --git a/compiler/rustc_ty/src/ty.rs → compiler/rustc_ty_utils/src/ty.rs b/compiler/rustc_ty/src/ty.rs → compiler/rustc_ty_utils/src/ty.rs