Auto merge of #783 - compiler-errors:remove-empty, r=jackh726

bors · bors · commit ee06f54a31e9 · 2022-11-10T15:14:31.000Z
Remove empty lifetime

It's no longer present in rustc, so we probably don't need it in Chalk either.
diff --git a/chalk-engine/src/slg/resolvent.rs b/chalk-engine/src/slg/resolvent.rs
@@ -614,8 +614,7 @@ impl<'i, I: Interner> Zipper<I> for AnswerSubstitutor<'i, I> {
 
             (LifetimeData::Static, LifetimeData::Static)
             | (LifetimeData::Placeholder(_), LifetimeData::Placeholder(_))
-            | (LifetimeData::Erased, LifetimeData::Erased)
-            | (LifetimeData::Empty(_), LifetimeData::Empty(_)) => {
+            | (LifetimeData::Erased, LifetimeData::Erased) => {
                 assert_eq!(answer, pending);
                 Ok(())
             }
@@ -628,8 +627,7 @@ impl<'i, I: Interner> Zipper<I> for AnswerSubstitutor<'i, I> {
             (LifetimeData::Static, _)
             | (LifetimeData::BoundVar(_), _)
             | (LifetimeData::Placeholder(_), _)
-            | (LifetimeData::Erased, _)
-            | (LifetimeData::Empty(_), _) => panic!(
+            | (LifetimeData::Erased, _) => panic!(
                 "structural mismatch between answer `{:?}` and pending goal `{:?}`",
                 answer, pending,
             ),
diff --git a/chalk-integration/src/lowering.rs b/chalk-integration/src/lowering.rs
@@ -880,10 +880,6 @@ impl LowerWithEnv for Lifetime {
                 interner,
                 chalk_ir::LifetimeData::Static,
             )),
-            Lifetime::Empty => Ok(chalk_ir::Lifetime::new(
-                interner,
-                chalk_ir::LifetimeData::Empty(chalk_ir::UniverseIndex { counter: 0 }),
-            )),
             Lifetime::Erased => Ok(chalk_ir::Lifetime::new(
                 interner,
                 chalk_ir::LifetimeData::Erased,
diff --git a/chalk-ir/src/debug.rs b/chalk-ir/src/debug.rs
@@ -306,8 +306,6 @@ impl<I: Interner> Debug for LifetimeData<I> {
             LifetimeData::InferenceVar(var) => write!(fmt, "'{:?}", var),
             LifetimeData::Placeholder(index) => write!(fmt, "'{:?}", index),
             LifetimeData::Static => write!(fmt, "'static"),
-            LifetimeData::Empty(UniverseIndex::ROOT) => write!(fmt, "'<empty>"),
-            LifetimeData::Empty(universe) => write!(fmt, "'<empty:{:?}>", universe),
             LifetimeData::Erased => write!(fmt, "'<erased>"),
             LifetimeData::Phantom(..) => unreachable!(),
         }
diff --git a/chalk-ir/src/fold.rs b/chalk-ir/src/fold.rs
@@ -821,7 +821,6 @@ where
                 folder.try_fold_free_placeholder_lifetime(*universe, outer_binder)
             }
             LifetimeData::Static => Ok(LifetimeData::<I>::Static.intern(folder.interner())),
-            LifetimeData::Empty(ui) => Ok(LifetimeData::<I>::Empty(*ui).intern(folder.interner())),
             LifetimeData::Erased => Ok(LifetimeData::<I>::Erased.intern(folder.interner())),
             LifetimeData::Phantom(void, ..) => match *void {},
         }
diff --git a/chalk-ir/src/lib.rs b/chalk-ir/src/lib.rs
@@ -1278,7 +1278,6 @@ impl<I: Interner> Lifetime<I> {
             LifetimeData::InferenceVar(_) => false,
             LifetimeData::Placeholder(_) => false,
             LifetimeData::Static => false,
-            LifetimeData::Empty(_) => false,
             LifetimeData::Erased => false,
             LifetimeData::Phantom(..) => unreachable!(),
         }
@@ -1297,7 +1296,7 @@ impl<I: Interner> Lifetime<I> {
                     | TypeFlags::HAS_FREE_LOCAL_REGIONS
                     | TypeFlags::HAS_FREE_REGIONS
             }
-            LifetimeData::Static | LifetimeData::Empty(_) => TypeFlags::HAS_FREE_REGIONS,
+            LifetimeData::Static => TypeFlags::HAS_FREE_REGIONS,
             LifetimeData::Phantom(_, _) => TypeFlags::empty(),
             LifetimeData::BoundVar(_) => TypeFlags::HAS_RE_LATE_BOUND,
             LifetimeData::Erased => TypeFlags::HAS_RE_ERASED,
@@ -1316,11 +1315,6 @@ pub enum LifetimeData<I: Interner> {
     Placeholder(PlaceholderIndex),
     /// Static lifetime
     Static,
-    /// An empty lifetime: a lifetime shorter than any other lifetime in a
-    /// universe with a lesser or equal index. The universe only non-zero in
-    /// lexical region resolve in rustc, so chalk shouldn't ever see a non-zero
-    /// index.
-    Empty(UniverseIndex),
     /// An erased lifetime, used by rustc to improve caching when we doesn't
     /// care about lifetimes
     Erased,
diff --git a/chalk-ir/src/visit.rs b/chalk-ir/src/visit.rs
@@ -330,9 +330,7 @@ impl<I: Interner> TypeSuperVisitable<I> for Lifetime<I> {
             LifetimeData::Placeholder(universe) => {
                 visitor.visit_free_placeholder(*universe, outer_binder)
             }
-            LifetimeData::Static | LifetimeData::Empty(_) | LifetimeData::Erased => {
-                ControlFlow::Continue(())
-            }
+            LifetimeData::Static | LifetimeData::Erased => ControlFlow::Continue(()),
             LifetimeData::Phantom(void, ..) => match *void {},
         }
     }
diff --git a/chalk-parse/src/ast.rs b/chalk-parse/src/ast.rs
@@ -392,7 +392,6 @@ pub enum Lifetime {
     Id { name: Identifier },
     Static,
     Erased,
-    Empty,
 }
 
 #[derive(Clone, PartialEq, Eq, Debug)]
diff --git a/chalk-parse/src/parser.lalrpop b/chalk-parse/src/parser.lalrpop
@@ -493,7 +493,6 @@ Lifetime: Lifetime = {
     <n:LifetimeId> => Lifetime::Id { name: n },
     "'static" => Lifetime::Static,
     "'erased" => Lifetime::Erased,
-    "'empty" => Lifetime::Empty,
 };
 
 ConstWithoutId: Const = {
diff --git a/chalk-solve/src/display/ty.rs b/chalk-solve/src/display/ty.rs
@@ -240,7 +240,6 @@ impl<I: Interner> RenderAsRust<I> for LifetimeData<I> {
                 write!(f, "'_placeholder_{}_{}", ix.ui.counter, ix.idx)
             }
             LifetimeData::Static => write!(f, "'static"),
-            LifetimeData::Empty(_) => write!(f, "'<empty>"),
             LifetimeData::Erased => write!(f, "'_"),
             // Matching the void ensures at compile time that this code is
             // unreachable
diff --git a/chalk-solve/src/infer/canonicalize.rs b/chalk-solve/src/infer/canonicalize.rs
@@ -1,7 +1,7 @@
 use crate::debug_span;
 use chalk_derive::FallibleTypeFolder;
 use chalk_ir::fold::shift::Shift;
-use chalk_ir::fold::{TypeFoldable, TypeFolder, TypeSuperFoldable};
+use chalk_ir::fold::{TypeFoldable, TypeFolder};
 use chalk_ir::interner::{HasInterner, Interner};
 use chalk_ir::*;
 use std::cmp::max;
@@ -231,17 +231,6 @@ impl<'i, I: Interner> TypeFolder<I> for Canonicalizer<'i, I> {
         }
     }
 
-    fn fold_lifetime(&mut self, lifetime: Lifetime<I>, outer_binder: DebruijnIndex) -> Lifetime<I> {
-        match *lifetime.data(self.interner) {
-            LifetimeData::Empty(ui) if ui.counter != 0 => {
-                // ReEmpty in non-root universes is only used by lexical region
-                // inference. We shouldn't see it in canonicalization.
-                panic!("Cannot canonicalize ReEmpty in non-root universe")
-            }
-            _ => lifetime.super_fold_with(self, outer_binder),
-        }
-    }
-
     fn interner(&self) -> I {
         self.interner
     }
diff --git a/chalk-solve/src/infer/unify.rs b/chalk-solve/src/infer/unify.rs
@@ -955,18 +955,12 @@ impl<'t, I: Interner> Unifier<'t, I> {
             (
                 &LifetimeData::InferenceVar(a_var),
                 &LifetimeData::Placeholder(PlaceholderIndex { ui, .. }),
-            )
-            | (&LifetimeData::InferenceVar(a_var), &LifetimeData::Empty(ui)) => {
-                self.unify_lifetime_var(variance, a_var, b, ui)
-            }
+            ) => self.unify_lifetime_var(variance, a_var, b, ui),
 
             (
                 &LifetimeData::Placeholder(PlaceholderIndex { ui, .. }),
                 &LifetimeData::InferenceVar(b_var),
-            )
-            | (&LifetimeData::Empty(ui), &LifetimeData::InferenceVar(b_var)) => {
-                self.unify_lifetime_var(variance.invert(), b_var, a, ui)
-            }
+            ) => self.unify_lifetime_var(variance.invert(), b_var, a, ui),
 
             (&LifetimeData::InferenceVar(a_var), &LifetimeData::Erased)
             | (&LifetimeData::InferenceVar(a_var), &LifetimeData::Static) => {
@@ -982,19 +976,12 @@ impl<'t, I: Interner> Unifier<'t, I> {
             | (&LifetimeData::Erased, &LifetimeData::Erased) => Ok(()),
 
             (&LifetimeData::Static, &LifetimeData::Placeholder(_))
-            | (&LifetimeData::Static, &LifetimeData::Empty(_))
             | (&LifetimeData::Static, &LifetimeData::Erased)
             | (&LifetimeData::Placeholder(_), &LifetimeData::Static)
             | (&LifetimeData::Placeholder(_), &LifetimeData::Placeholder(_))
-            | (&LifetimeData::Placeholder(_), &LifetimeData::Empty(_))
             | (&LifetimeData::Placeholder(_), &LifetimeData::Erased)
-            | (&LifetimeData::Empty(_), &LifetimeData::Static)
-            | (&LifetimeData::Empty(_), &LifetimeData::Placeholder(_))
-            | (&LifetimeData::Empty(_), &LifetimeData::Empty(_))
-            | (&LifetimeData::Empty(_), &LifetimeData::Erased)
             | (&LifetimeData::Erased, &LifetimeData::Static)
-            | (&LifetimeData::Erased, &LifetimeData::Placeholder(_))
-            | (&LifetimeData::Erased, &LifetimeData::Empty(_)) => {
+            | (&LifetimeData::Erased, &LifetimeData::Placeholder(_)) => {
                 if a != b {
                     self.push_lifetime_outlives_goals(variance, a.clone(), b.clone());
                     Ok(())
diff --git a/tests/test/lifetimes.rs b/tests/test/lifetimes.rs
@@ -24,17 +24,6 @@ fn erased_lowering() {
     }
 }
 
-#[test]
-fn empty_lowering() {
-    lowering_success! {
-        program {
-            struct A<'a> where 'a: 'empty {}
-            trait B<'a> where 'a: 'empty {}
-            fn foo(a: &'empty ());
-        }
-    }
-}
-
 #[test]
 fn static_outlives() {
     test! {
@@ -63,34 +52,6 @@ fn static_outlives() {
     }
 }
 
-#[test]
-fn empty_outlives() {
-    test! {
-        program {
-            trait Foo<'a> where 'a: 'empty {}
-            struct Bar {}
-
-            impl<'a> Foo<'a> for Bar where 'a: 'empty {}
-        }
-
-        goal {
-            exists<'a> {
-                Bar: Foo<'a>
-            }
-        } yields {
-            expect![["Unique; for<?U0> { substitution [?0 := '^0.0], lifetime constraints [InEnvironment { environment: Env([]), goal: '^0.0: '<empty> }] }"]]
-        }
-
-        goal {
-            forall<'a> {
-                Bar: Foo<'a>
-            }
-        } yields {
-            expect![["Unique; lifetime constraints [InEnvironment { environment: Env([]), goal: '!1_0: '<empty> }]"]]
-        }
-    }
-}
-
 #[test]
 fn erased_outlives() {
     test! {
@@ -164,20 +125,3 @@ fn erased_impls() {
         }
     }
 }
-
-#[test]
-fn empty_impls() {
-    test! {
-        program {
-            struct Foo {}
-            trait Bar {}
-            impl<'a> Bar for &'a Foo {}
-        }
-
-        goal {
-            &'empty Foo: Bar
-        } yields {
-            expect![["Unique"]]
-        }
-    }
-}

Original file line number	Diff line number	Diff line change
`@@ -306,8 +306,6 @@ impl<I: Interner> Debug for LifetimeData<I> {`
`306`	`306`	`LifetimeData::InferenceVar(var) => write!(fmt, "'{:?}", var),`
`307`	`307`	`LifetimeData::Placeholder(index) => write!(fmt, "'{:?}", index),`
`308`	`308`	`LifetimeData::Static => write!(fmt, "'static"),`
`309`		`- LifetimeData::Empty(UniverseIndex::ROOT) => write!(fmt, "'<empty>"),`
`310`		`- LifetimeData::Empty(universe) => write!(fmt, "'<empty:{:?}>", universe),`
`311`	`309`	`LifetimeData::Erased => write!(fmt, "'<erased>"),`
`312`	`310`	`LifetimeData::Phantom(..) => unreachable!(),`
`313`	`311`	`}`
Original file line number	Diff line number	Diff line change
`@@ -821,7 +821,6 @@ where`
`821`	`821`	`folder.try_fold_free_placeholder_lifetime(*universe, outer_binder)`
`822`	`822`	`}`
`823`	`823`	`LifetimeData::Static => Ok(LifetimeData::<I>::Static.intern(folder.interner())),`
`824`		`- LifetimeData::Empty(ui) => Ok(LifetimeData::<I>::Empty(*ui).intern(folder.interner())),`
`825`	`824`	`LifetimeData::Erased => Ok(LifetimeData::<I>::Erased.intern(folder.interner())),`
`826`	`825`	`LifetimeData::Phantom(void, ..) => match *void {},`
`827`	`826`	`}`
Original file line number	Diff line number	Diff line change
`@@ -330,9 +330,7 @@ impl<I: Interner> TypeSuperVisitable<I> for Lifetime<I> {`
`330`	`330`	`LifetimeData::Placeholder(universe) => {`
`331`	`331`	`visitor.visit_free_placeholder(*universe, outer_binder)`
`332`	`332`	`}`
`333`		`- LifetimeData::Static \| LifetimeData::Empty(_) \| LifetimeData::Erased => {`
`334`		`- ControlFlow::Continue(())`
`335`		`- }`
	`333`	`+ LifetimeData::Static \| LifetimeData::Erased => ControlFlow::Continue(()),`
`336`	`334`	`LifetimeData::Phantom(void, ..) => match *void {},`
`337`	`335`	`}`
`338`	`336`	`}`
Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,6 @@ pub enum Lifetime {`
`392`	`392`	`Id { name: Identifier },`
`393`	`393`	`Static,`
`394`	`394`	`Erased,`
`395`		`- Empty,`
`396`	`395`	`}`
`397`	`396`
`398`	`397`	`#[derive(Clone, PartialEq, Eq, Debug)]`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,6 @@ impl<I: Interner> RenderAsRust<I> for LifetimeData<I> {`
`240`	`240`	`write!(f, "'_placeholder_{}_{}", ix.ui.counter, ix.idx)`
`241`	`241`	`}`
`242`	`242`	`LifetimeData::Static => write!(f, "'static"),`
`243`		`- LifetimeData::Empty(_) => write!(f, "'<empty>"),`
`244`	`243`	`LifetimeData::Erased => write!(f, "'_"),`
`245`	`244`	`// Matching the void ensures at compile time that this code is`
`246`	`245`	`// unreachable`