stop special-casing 'static in evaluate

2023-03-22 11:37:57 +01:00
parent 9bdb4881c7
commit 73c79cd806
7 changed files with 151 additions and 102 deletions
--- a/compiler/rustc_infer/src/infer/mod.rs
+++ b/compiler/rustc_infer/src/infer/mod.rs
@@ -706,12 +706,7 @@ impl<'tcx> InferCtxt<'tcx> {
    }

    pub fn freshener<'b>(&'b self) -> TypeFreshener<'b, 'tcx> {
-        freshen::TypeFreshener::new(self, false)
-    }
-
-    /// Like `freshener`, but does not replace `'static` regions.
-    pub fn freshener_keep_static<'b>(&'b self) -> TypeFreshener<'b, 'tcx> {
-        freshen::TypeFreshener::new(self, true)
+        freshen::TypeFreshener::new(self)
    }

    pub fn unsolved_variables(&self) -> Vec<Ty<'tcx>> {