Use rustc_type_ir directly in derived traversables

Author: eggyal

Cargo.lock

@@ -4045,6 +4045,7 @@ dependencies = [
  "rustc_serialize",
  "rustc_span",
  "rustc_target",
+ "rustc_type_ir",
  "smallvec",
  "tracing",
 ]
@@ -4614,6 +4615,7 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "rustc_transmute",
+ "rustc_type_ir",
  "smallvec",
  "tracing",
 ]
@@ -4643,6 +4645,7 @@ dependencies = [
  "rustc_middle",
  "rustc_span",
  "rustc_target",
+ "rustc_type_ir",
  "tracing",
 ]
 

compiler/rustc_infer/Cargo.toml

@@ -18,6 +18,7 @@ rustc_middle = { path = "../rustc_middle" }
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_span = { path = "../rustc_span" }
 rustc_target = { path = "../rustc_target" }
+rustc_type_ir = { path = "../rustc_type_ir" }
 smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
 tracing = "0.1"
 # tidy-alphabetical-end

compiler/rustc_macros/src/traversable.rs

@@ -168,7 +168,7 @@ pub trait Traversable {
 
 impl Traversable for Foldable {
     fn traversable(interner: &Interner<'_>) -> TokenStream {
-        quote! { ::rustc_middle::ty::fold::TypeFoldable<#interner> }
+        quote! { ::rustc_type_ir::fold::TypeFoldable<#interner> }
     }
     fn supertraits(interner: &Interner<'_>) -> TokenStream {
         Visitable::traversable(interner)
@@ -177,7 +177,7 @@ impl Traversable for Foldable {
         if noop {
             bind
         } else {
-            quote! { ::rustc_middle::ty::noop_traversal_if_boring!(#bind.try_fold_with(folder))? }
+            quote! { ::rustc_type_ir::noop_traversal_if_boring!(#bind.try_fold_with(folder))? }
         }
     }
     fn arm(
@@ -193,7 +193,7 @@ impl Traversable for Foldable {
         body: impl ToTokens,
     ) -> TokenStream {
         quote! {
-            fn try_fold_with<#traverser: ::rustc_middle::ty::fold::FallibleTypeFolder<#interner>>(
+            fn try_fold_with<#traverser: ::rustc_type_ir::fold::FallibleTypeFolder<#interner>>(
                 self,
                 folder: &mut #traverser
             ) -> ::core::result::Result<Self, #traverser::Error> {
@@ -205,7 +205,7 @@ impl Traversable for Foldable {
 
 impl Traversable for Visitable {
     fn traversable(interner: &Interner<'_>) -> TokenStream {
-        quote! { ::rustc_middle::ty::visit::TypeVisitable<#interner> }
+        quote! { ::rustc_type_ir::visit::TypeVisitable<#interner> }
     }
     fn supertraits(_: &Interner<'_>) -> TokenStream {
         quote! { ::core::clone::Clone + ::core::fmt::Debug }
@@ -214,7 +214,7 @@ impl Traversable for Visitable {
         if noop {
             quote! {}
         } else {
-            quote! { ::rustc_middle::ty::noop_traversal_if_boring!(#bind.visit_with(visitor))?; }
+            quote! { ::rustc_type_ir::noop_traversal_if_boring!(#bind.visit_with(visitor))?; }
         }
     }
     fn arm(
@@ -234,7 +234,7 @@ impl Traversable for Visitable {
         body: impl ToTokens,
     ) -> TokenStream {
         quote! {
-            fn visit_with<#traverser: ::rustc_middle::ty::visit::TypeVisitor<#interner>>(
+            fn visit_with<#traverser: ::rustc_type_ir::visit::TypeVisitor<#interner>>(
                 &self,
                 visitor: &mut #traverser
             ) -> ::core::ops::ControlFlow<#traverser::BreakTy> {
@@ -294,7 +294,7 @@ pub fn traversable_derive<T: Traversable>(
 ) -> Result<TokenStream, Error> {
     use WhenToSkip::*;
 
-    let skip_traversal = quote! { ::rustc_middle::ty::BoringTraversable };
+    let skip_traversal = quote! { ::rustc_type_ir::BoringTraversable };
 
     let ast = structure.ast();
 

compiler/rustc_macros/src/traversable/tests.rs

@@ -37,17 +37,28 @@ impl Fold for Normalizer {
     fn fold_path(&mut self, i: syn::Path) -> syn::Path {
         syn::fold::fold_path(
             self,
-            if let Some(n) = if i.leading_colon.is_some() && i.segments.len() >= 3 {
+            if let Some(n) = if i.leading_colon.is_some() && i.segments.len() >= 2 {
                 let segment = &i.segments[0];
-                if *segment == parse_quote! { rustc_middle } && i.segments[1] == parse_quote! { ty }
-                {
-                    let segment = &i.segments[2];
-                    if *segment == parse_quote! { fold } || *segment == parse_quote! { visit } {
-                        Some(3)
-                    } else {
+                if *segment == parse_quote! { rustc_type_ir } {
+                    let segment = &i.segments[1];
+                    if i.segments.len() > 2 && *segment == parse_quote! { fold }
+                        || *segment == parse_quote! { visit }
+                    {
                         Some(2)
+                    } else if *segment == parse_quote! { BoringTraversable }
+                        || *segment == parse_quote! { Interner }
+                        || *segment == parse_quote! { noop_traversal_if_boring }
+                    {
+                        Some(1)
+                    } else {
+                        None
                     }
-                } else if *segment == parse_quote! { core } {
+                } else if i.segments.len() > 2
+                    && *segment == parse_quote! { rustc_middle }
+                    && i.segments[1] == parse_quote! { ty }
+                {
+                    Some(2)
+                } else if i.segments.len() > 2 && *segment == parse_quote! { core } {
                     let segment = &i.segments[1];
                     if *segment == parse_quote! { ops } {
                         Some(2)

compiler/rustc_trait_selection/Cargo.toml

@@ -22,6 +22,7 @@ rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }
 rustc_target = { path = "../rustc_target" }
 rustc_transmute = { path = "../rustc_transmute", features = ["rustc"] }
+rustc_type_ir = { path = "../rustc_type_ir" }
 smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
 tracing = "0.1"
 # tidy-alphabetical-end

compiler/rustc_transmute/Cargo.toml

@@ -12,6 +12,7 @@ rustc_macros = { path = "../rustc_macros", optional = true}
 rustc_middle = { path = "../rustc_middle", optional = true}
 rustc_span = { path = "../rustc_span", optional = true}
 rustc_target = { path = "../rustc_target", optional = true}
+rustc_type_ir = { path = "../rustc_type_ir", optional = true}
 tracing = "0.1"
 # tidy-alphabetical-end
 
@@ -23,6 +24,7 @@ rustc = [
     "rustc_middle",
     "rustc_span",
     "rustc_target",
+    "rustc_type_ir",
 ]
 
 [dev-dependencies]