From: Ralf Jung <post@ralfj.de>
Date: Tue, 31 May 2022 12:44:48 +0000 (-0400)
Subject: fix some lifetime names
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=62c48b29987cd0e01d0140fcd01185fd02a57795;p=rust.git

fix some lifetime names
---

diff --git a/src/helpers.rs b/src/helpers.rs
index 5a76e15465c..d9a7edcc113 100644
--- a/src/helpers.rs
+++ b/src/helpers.rs
@@ -810,12 +810,12 @@ pub fn current_span(&self) -> CurrentSpan<'_, 'mir, 'tcx> {
 /// topmost frame which corresponds to a local crate, and returns the current span in that frame.
 /// The result of that search is cached so that later calls are approximately free.
 #[derive(Clone)]
-pub struct CurrentSpan<'a, 'tcx, 'mir> {
+pub struct CurrentSpan<'a, 'mir, 'tcx> {
     span: Option<Span>,
-    machine: &'a Evaluator<'tcx, 'mir>,
+    machine: &'a Evaluator<'mir, 'tcx>,
 }
 
-impl<'a, 'tcx, 'mir> CurrentSpan<'a, 'tcx, 'mir> {
+impl<'a, 'mir, 'tcx> CurrentSpan<'a, 'mir, 'tcx> {
     pub fn get(&mut self) -> Span {
         *self.span.get_or_insert_with(|| Self::current_span(&self.machine))
     }
diff --git a/src/stacked_borrows.rs b/src/stacked_borrows.rs
index e2e63f8a52a..6cb71f43118 100644
--- a/src/stacked_borrows.rs
+++ b/src/stacked_borrows.rs
@@ -708,7 +708,7 @@ fn reborrow(
         let current_span = &mut this.machine.current_span();
 
         let log_creation = |this: &MiriEvalContext<'mir, 'tcx>,
-                            current_span: &mut CurrentSpan<'_, '_, '_>,
+                            current_span: &mut CurrentSpan<'_, 'mir, 'tcx>,
                             alloc_id,
                             base_offset,
                             orig_tag|