diff --git a/.pick_status.json b/.pick_status.json index 3f42a192d5d..f05418f7763 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -8244,7 +8244,7 @@ "description": "compiler/rust: fix errors about hiding elided lifetime", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/compiler/rust/cfg.rs b/src/compiler/rust/cfg.rs index 109e7850e8a..3bf0ac0caa3 100644 --- a/src/compiler/rust/cfg.rs +++ b/src/compiler/rust/cfg.rs @@ -275,12 +275,12 @@ impl CFG { } /// Returns an iterator over the nodes. - pub fn iter(&self) -> slice::Iter> { + pub fn iter(&self) -> slice::Iter<'_, CFGNode> { self.nodes.iter() } /// Returns a mutable iterator over the nodes. - pub fn iter_mut(&mut self) -> slice::IterMut> { + pub fn iter_mut(&mut self) -> slice::IterMut<'_, CFGNode> { self.nodes.iter_mut() } diff --git a/src/compiler/rust/nir.rs b/src/compiler/rust/nir.rs index d0fdbb4e412..4381bf8b04a 100644 --- a/src/compiler/rust/nir.rs +++ b/src/compiler/rust/nir.rs @@ -406,7 +406,7 @@ impl nir_phi_src { } impl nir_phi_instr { - pub fn iter_srcs(&self) -> ExecListIter { + pub fn iter_srcs(&self) -> ExecListIter<'_, nir_phi_src> { ExecListIter::new(&self.srcs, offset_of!(nir_phi_src, node)) } } @@ -494,7 +494,7 @@ impl nir_instr { } impl nir_block { - pub fn iter_instr_list(&self) -> ExecListIter { + pub fn iter_instr_list(&self) -> ExecListIter<'_, nir_instr> { ExecListIter::new(&self.instr_list, offset_of!(nir_instr, node)) } @@ -529,11 +529,11 @@ impl nir_if { self.iter_else_list().next().unwrap().as_block().unwrap() } - pub fn iter_then_list(&self) -> ExecListIter { + pub fn iter_then_list(&self) -> ExecListIter<'_, nir_cf_node> { ExecListIter::new(&self.then_list, offset_of!(nir_cf_node, node)) } - pub fn iter_else_list(&self) -> ExecListIter { + pub fn iter_else_list(&self) -> ExecListIter<'_, nir_cf_node> { ExecListIter::new(&self.else_list, offset_of!(nir_cf_node, node)) } @@ -543,7 +543,7 @@ impl nir_if { } impl nir_loop { - pub fn iter_body(&self) -> ExecListIter { + pub fn iter_body(&self) -> ExecListIter<'_, nir_cf_node> { ExecListIter::new(&self.body, offset_of!(nir_cf_node, node)) } @@ -599,7 +599,7 @@ impl nir_cf_node { } impl nir_function_impl { - pub fn iter_body(&self) -> ExecListIter { + pub fn iter_body(&self) -> ExecListIter<'_, nir_cf_node> { ExecListIter::new(&self.body, offset_of!(nir_cf_node, node)) } @@ -619,11 +619,11 @@ impl nir_function { } impl nir_shader { - pub fn iter_functions(&self) -> ExecListIter { + pub fn iter_functions(&self) -> ExecListIter<'_, nir_function> { ExecListIter::new(&self.functions, offset_of!(nir_function, node)) } - pub fn iter_variables(&self) -> ExecListIter { + pub fn iter_variables(&self) -> ExecListIter<'_, nir_variable> { ExecListIter::new(&self.variables, offset_of!(nir_variable, node)) } } diff --git a/src/nouveau/compiler/nak/ir.rs b/src/nouveau/compiler/nak/ir.rs index 0bacf0b25b8..19720120830 100644 --- a/src/nouveau/compiler/nak/ir.rs +++ b/src/nouveau/compiler/nak/ir.rs @@ -337,12 +337,12 @@ impl PerRegFile { } /// Iterates over the values in this container. - pub fn values(&self) -> slice::Iter { + pub fn values(&self) -> slice::Iter<'_, T> { self.per_file.iter() } /// Iterates over the mutable values in this container. - pub fn values_mut(&mut self) -> slice::IterMut { + pub fn values_mut(&mut self) -> slice::IterMut<'_, T> { self.per_file.iter_mut() } }