about summary refs log tree commit diff
path: root/compiler
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-11-19 23:58:48 +0100
committerGitHub <noreply@github.com>2020-11-19 23:58:48 +0100
commit95da42559316b4b399750eaffb4cc708ea22c430 (patch)
treede8081aeb4ae013e790b9ecc287b54c136530e3d /compiler
parent39495cb342f87a7d0eabc7092b07014fa658b3d4 (diff)
parentf59d03038c8601a66bd165a2f1980109665d077c (diff)
downloadrust-95da42559316b4b399750eaffb4cc708ea22c430.tar.gz
rust-95da42559316b4b399750eaffb4cc708ea22c430.zip
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`
Diffstat (limited to 'compiler')
-rw-r--r--compiler/rustc_infer/src/infer/error_reporting/nice_region_error/util.rs2
-rw-r--r--compiler/rustc_interface/Cargo.toml2
-rw-r--r--compiler/rustc_interface/src/passes.rs2
-rw-r--r--compiler/rustc_trait_selection/src/traits/project.rs2
-rw-r--r--compiler/rustc_ty_utils/Cargo.toml (renamed from compiler/rustc_ty/Cargo.toml)2
-rw-r--r--compiler/rustc_ty_utils/src/common_traits.rs (renamed from compiler/rustc_ty/src/common_traits.rs)0
-rw-r--r--compiler/rustc_ty_utils/src/instance.rs (renamed from compiler/rustc_ty/src/instance.rs)0
-rw-r--r--compiler/rustc_ty_utils/src/lib.rs (renamed from compiler/rustc_ty/src/lib.rs)0
-rw-r--r--compiler/rustc_ty_utils/src/needs_drop.rs (renamed from compiler/rustc_ty/src/needs_drop.rs)0
-rw-r--r--compiler/rustc_ty_utils/src/ty.rs (renamed from compiler/rustc_ty/src/ty.rs)0
10 files changed, 5 insertions, 5 deletions
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
index 8d0100440a8..61fad8863e7 100644
--- 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
index e214493a567..2481a27dee7 100644
--- 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
index 82cf4ab7f5c..5fd560d7eff 100644
--- 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
index dead795c6af..df472e6ed7e 100644
--- 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 b/compiler/rustc_ty_utils/Cargo.toml
index acb011b2dc0..5020437bcf9 100644
--- a/compiler/rustc_ty/Cargo.toml
+++ b/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 b/compiler/rustc_ty_utils/src/common_traits.rs
index 24ba0717866..24ba0717866 100644
--- a/compiler/rustc_ty/src/common_traits.rs
+++ b/compiler/rustc_ty_utils/src/common_traits.rs
diff --git a/compiler/rustc_ty/src/instance.rs b/compiler/rustc_ty_utils/src/instance.rs
index cf2c6efb471..cf2c6efb471 100644
--- a/compiler/rustc_ty/src/instance.rs
+++ b/compiler/rustc_ty_utils/src/instance.rs
diff --git a/compiler/rustc_ty/src/lib.rs b/compiler/rustc_ty_utils/src/lib.rs
index 904c0062a92..904c0062a92 100644
--- a/compiler/rustc_ty/src/lib.rs
+++ b/compiler/rustc_ty_utils/src/lib.rs
diff --git a/compiler/rustc_ty/src/needs_drop.rs b/compiler/rustc_ty_utils/src/needs_drop.rs
index d62fc764c76..d62fc764c76 100644
--- a/compiler/rustc_ty/src/needs_drop.rs
+++ b/compiler/rustc_ty_utils/src/needs_drop.rs
diff --git a/compiler/rustc_ty/src/ty.rs b/compiler/rustc_ty_utils/src/ty.rs
index 720ad42da2a..720ad42da2a 100644
--- a/compiler/rustc_ty/src/ty.rs
+++ b/compiler/rustc_ty_utils/src/ty.rs