From 5b956fbf60ee36ba1e7b56e7747f31c0e3586c46 Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Mon, 11 Aug 2025 14:31:16 -0400 Subject: [PATCH] ZJIT: Fix `mismatched_lifetime_syntaxes`, new in Rust 1.89.0 --- zjit/src/backend/lir.rs | 4 ++-- zjit/src/hir.rs | 12 ++++++------ zjit/src/hir_type/mod.rs | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/zjit/src/backend/lir.rs b/zjit/src/backend/lir.rs index 3263392cf6..0902d347c7 100644 --- a/zjit/src/backend/lir.rs +++ b/zjit/src/backend/lir.rs @@ -549,13 +549,13 @@ pub enum Insn { impl Insn { /// Create an iterator that will yield a non-mutable reference to each /// operand in turn for this instruction. - pub(super) fn opnd_iter(&self) -> InsnOpndIterator { + pub(super) fn opnd_iter(&self) -> InsnOpndIterator<'_> { InsnOpndIterator::new(self) } /// Create an iterator that will yield a mutable reference to each operand /// in turn for this instruction. - pub(super) fn opnd_iter_mut(&mut self) -> InsnOpndMutIterator { + pub(super) fn opnd_iter_mut(&mut self) -> InsnOpndMutIterator<'_> { InsnOpndMutIterator::new(self) } diff --git a/zjit/src/hir.rs b/zjit/src/hir.rs index 87d2a613d0..bff0fcd757 100644 --- a/zjit/src/hir.rs +++ b/zjit/src/hir.rs @@ -67,7 +67,7 @@ impl std::fmt::Display for VALUE { } impl VALUE { - pub fn print(self, ptr_map: &PtrPrintMap) -> VALUEPrinter { + pub fn print(self, ptr_map: &PtrPrintMap) -> VALUEPrinter<'_> { VALUEPrinter { inner: self, ptr_map } } } @@ -136,7 +136,7 @@ pub enum Invariant { } impl Invariant { - pub fn print(self, ptr_map: &PtrPrintMap) -> InvariantPrinter { + pub fn print(self, ptr_map: &PtrPrintMap) -> InvariantPrinter<'_> { InvariantPrinter { inner: self, ptr_map } } } @@ -810,12 +810,12 @@ pub struct Block { impl Block { /// Return an iterator over params - pub fn params(&self) -> Iter { + pub fn params(&self) -> Iter<'_, InsnId> { self.params.iter() } /// Return an iterator over insns - pub fn insns(&self) -> Iter { + pub fn insns(&self) -> Iter<'_, InsnId> { self.insns.iter() } } @@ -2450,12 +2450,12 @@ impl FrameState { } /// Iterate over all stack slots - pub fn stack(&self) -> Iter { + pub fn stack(&self) -> Iter<'_, InsnId> { self.stack.iter() } /// Iterate over all local variables - pub fn locals(&self) -> Iter { + pub fn locals(&self) -> Iter<'_, InsnId> { self.locals.iter() } diff --git a/zjit/src/hir_type/mod.rs b/zjit/src/hir_type/mod.rs index 607ccbde84..c18b2735be 100644 --- a/zjit/src/hir_type/mod.rs +++ b/zjit/src/hir_type/mod.rs @@ -501,7 +501,7 @@ impl Type { self.is_subtype(types::Immediate) } - pub fn print(self, ptr_map: &PtrPrintMap) -> TypePrinter { + pub fn print(self, ptr_map: &PtrPrintMap) -> TypePrinter<'_> { TypePrinter { inner: self, ptr_map } } }