about summary refs log tree commit diff
path: root/src/librustc
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2019-06-16 12:33:47 +0300
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2019-06-18 18:10:26 +0300
commit4c4fc7512eff62f5cc63a1a30f4474db003884c9 (patch)
tree92c659f2e003119d2f7e1799a35e930c1eb071bf /src/librustc
parent356a37d8d1e9c62481970c36ef45fe7f4f936549 (diff)
rustc: reintroduce lifetime bounds where necessary.
Diffstat (limited to 'src/librustc')
-rw-r--r--src/librustc/infer/lattice.rs2
-rw-r--r--src/librustc/traits/select.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc/infer/lattice.rs b/src/librustc/infer/lattice.rs
index e55ce345bd9..68cbef44076 100644
--- a/src/librustc/infer/lattice.rs
+++ b/src/librustc/infer/lattice.rs
@@ -41,7 +41,7 @@ pub trait LatticeDir<'f, 'tcx>: TypeRelation<'tcx> {
     fn relate_bound(&mut self, v: Ty<'tcx>, a: Ty<'tcx>, b: Ty<'tcx>) -> RelateResult<'tcx, ()>;
 }
 
-pub fn super_lattice_tys<'a, 'tcx, L>(
+pub fn super_lattice_tys<'a, 'tcx: 'a, L>(
     this: &mut L,
     a: Ty<'tcx>,
     b: Ty<'tcx>,
diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs
index 645b6f418dc..7c4742259ac 100644
--- a/src/librustc/traits/select.rs
+++ b/src/librustc/traits/select.rs
@@ -3788,9 +3788,9 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
         matcher.relate(previous, current).is_ok()
     }
 
-    fn push_stack<'o, 's>(
+    fn push_stack<'o>(
         &mut self,
-        previous_stack: TraitObligationStackList<'s, 'tcx>,
+        previous_stack: TraitObligationStackList<'o, 'tcx>,
         obligation: &'o TraitObligation<'tcx>,
     ) -> TraitObligationStack<'o, 'tcx> {
         let fresh_trait_ref = obligation