Skip to content

Commit 8d32578

Browse files
nnethercotennethercote
committed
Rename and reorder lots of lifetimes.
- Replace non-standard names like 's, 'p, 'rg, 'ck, 'parent, 'this, and 'me with vanilla 'a. These are cases where the original name isn't really any more informative than 'a. - Replace names like 'cx, 'mir, and 'body with vanilla 'a when the lifetime applies to multiple fields and so the original lifetime name isn't really accurate. - Put 'tcx last in lifetime lists, and 'a before 'b.
1 parent 606b9cb commit 8d32578

File tree

40 files changed

+169
-170
lines changed

40 files changed

+169
-170
lines changed

‎compiler/rustc_borrowck/src/constraints/graph.rs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ impl<D: ConstraintGraphDirection> ConstraintGraph<D> {
9797
/// Given the constraint set from which this graph was built
9898
/// creates a region graph so that you can iterate over *regions*
9999
/// and not constraints.
100-
pub(crate) fn region_graph<'rg, 'tcx>(
101-
&'rg self,
102-
set: &'rg OutlivesConstraintSet<'tcx>,
100+
pub(crate) fn region_graph<'a, 'tcx>(
101+
&'a self,
102+
set: &'a OutlivesConstraintSet<'tcx>,
103103
static_region: RegionVid,
104-
) -> RegionGraph<'rg, 'tcx, D> {
104+
) -> RegionGraph<'a, 'tcx, D> {
105105
RegionGraph::new(set, self, static_region)
106106
}
107107

@@ -130,15 +130,15 @@ impl<D: ConstraintGraphDirection> ConstraintGraph<D> {
130130
}
131131
}
132132

133-
pub(crate) struct Edges<'s, 'tcx, D: ConstraintGraphDirection> {
134-
graph: &'s ConstraintGraph<D>,
135-
constraints: &'s OutlivesConstraintSet<'tcx>,
133+
pub(crate) struct Edges<'a, 'tcx, D: ConstraintGraphDirection> {
134+
graph: &'a ConstraintGraph<D>,
135+
constraints: &'a OutlivesConstraintSet<'tcx>,
136136
pointer: Option<OutlivesConstraintIndex>,
137137
next_static_idx: Option<usize>,
138138
static_region: RegionVid,
139139
}
140140

141-
impl<'s, 'tcx, D: ConstraintGraphDirection> Iterator for Edges<'s, 'tcx, D> {
141+
impl<'a, 'tcx, D: ConstraintGraphDirection> Iterator for Edges<'a, 'tcx, D> {
142142
type Item = OutlivesConstraint<'tcx>;
143143

144144
fn next(&mut self) -> Option<Self::Item> {
@@ -171,55 +171,55 @@ impl<'s, 'tcx, D: ConstraintGraphDirection> Iterator for Edges<'s, 'tcx, D> {
171171
/// This struct brings together a constraint set and a (normal, not
172172
/// reverse) constraint graph. It implements the graph traits and is
173173
/// usd for doing the SCC computation.
174-
pub(crate) struct RegionGraph<'s, 'tcx, D: ConstraintGraphDirection> {
175-
set: &'s OutlivesConstraintSet<'tcx>,
176-
constraint_graph: &'s ConstraintGraph<D>,
174+
pub(crate) struct RegionGraph<'a, 'tcx, D: ConstraintGraphDirection> {
175+
set: &'a OutlivesConstraintSet<'tcx>,
176+
constraint_graph: &'a ConstraintGraph<D>,
177177
static_region: RegionVid,
178178
}
179179

180-
impl<'s, 'tcx, D: ConstraintGraphDirection> RegionGraph<'s, 'tcx, D> {
180+
impl<'a, 'tcx, D: ConstraintGraphDirection> RegionGraph<'a, 'tcx, D> {
181181
/// Creates a "dependency graph" where each region constraint `R1:
182182
/// R2` is treated as an edge `R1 -> R2`. We use this graph to
183183
/// construct SCCs for region inference but also for error
184184
/// reporting.
185185
pub(crate) fn new(
186-
set: &'s OutlivesConstraintSet<'tcx>,
187-
constraint_graph: &'s ConstraintGraph<D>,
186+
set: &'a OutlivesConstraintSet<'tcx>,
187+
constraint_graph: &'a ConstraintGraph<D>,
188188
static_region: RegionVid,
189189
) -> Self {
190190
Self { set, constraint_graph, static_region }
191191
}
192192

193193
/// Given a region `R`, iterate over all regions `R1` such that
194194
/// there exists a constraint `R: R1`.
195-
pub(crate) fn outgoing_regions(&self, region_sup: RegionVid) -> Successors<'s, 'tcx, D> {
195+
pub(crate) fn outgoing_regions(&self, region_sup: RegionVid) -> Successors<'a, 'tcx, D> {
196196
Successors {
197197
edges: self.constraint_graph.outgoing_edges(region_sup, self.set, self.static_region),
198198
}
199199
}
200200
}
201201

202-
pub(crate) struct Successors<'s, 'tcx, D: ConstraintGraphDirection> {
203-
edges: Edges<'s, 'tcx, D>,
202+
pub(crate) struct Successors<'a, 'tcx, D: ConstraintGraphDirection> {
203+
edges: Edges<'a, 'tcx, D>,
204204
}
205205

206-
impl<'s, 'tcx, D: ConstraintGraphDirection> Iterator for Successors<'s, 'tcx, D> {
206+
impl<'a, 'tcx, D: ConstraintGraphDirection> Iterator for Successors<'a, 'tcx, D> {
207207
type Item = RegionVid;
208208

209209
fn next(&mut self) -> Option<Self::Item> {
210210
self.edges.next().map(|c| D::end_region(&c))
211211
}
212212
}
213213

214-
impl<'s, 'tcx, D: ConstraintGraphDirection> graph::DirectedGraph for RegionGraph<'s, 'tcx, D> {
214+
impl<'a, 'tcx, D: ConstraintGraphDirection> graph::DirectedGraph for RegionGraph<'a, 'tcx, D> {
215215
type Node = RegionVid;
216216

217217
fn num_nodes(&self) -> usize {
218218
self.constraint_graph.first_constraints.len()
219219
}
220220
}
221221

222-
impl<'s, 'tcx, D: ConstraintGraphDirection> graph::Successors for RegionGraph<'s, 'tcx, D> {
222+
impl<'a, 'tcx, D: ConstraintGraphDirection> graph::Successors for RegionGraph<'a, 'tcx, D> {
223223
fn successors(&self, node: Self::Node) -> impl Iterator<Item = Self::Node> {
224224
self.outgoing_regions(node)
225225
}

‎compiler/rustc_borrowck/src/dataflow.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,16 @@ pub struct Borrows<'a, 'tcx> {
113113
borrows_out_of_scope_at_location: FxIndexMap<Location, Vec<BorrowIndex>>,
114114
}
115115

116-
struct OutOfScopePrecomputer<'mir, 'tcx> {
116+
struct OutOfScopePrecomputer<'a, 'tcx> {
117117
visited: BitSet<mir::BasicBlock>,
118118
visit_stack: Vec<mir::BasicBlock>,
119-
body: &'mir Body<'tcx>,
120-
regioncx: &'mir RegionInferenceContext<'tcx>,
119+
body: &'a Body<'tcx>,
120+
regioncx: &'a RegionInferenceContext<'tcx>,
121121
borrows_out_of_scope_at_location: FxIndexMap<Location, Vec<BorrowIndex>>,
122122
}
123123

124-
impl<'mir, 'tcx> OutOfScopePrecomputer<'mir, 'tcx> {
125-
fn new(body: &'mir Body<'tcx>, regioncx: &'mir RegionInferenceContext<'tcx>) -> Self {
124+
impl<'a, 'tcx> OutOfScopePrecomputer<'a, 'tcx> {
125+
fn new(body: &'a Body<'tcx>, regioncx: &'a RegionInferenceContext<'tcx>) -> Self {
126126
OutOfScopePrecomputer {
127127
visited: BitSet::new_empty(body.basic_blocks.len()),
128128
visit_stack: vec![],
@@ -225,17 +225,17 @@ pub fn calculate_borrows_out_of_scope_at_location<'tcx>(
225225
prec.borrows_out_of_scope_at_location
226226
}
227227

228-
struct PoloniusOutOfScopePrecomputer<'mir, 'tcx> {
228+
struct PoloniusOutOfScopePrecomputer<'a, 'tcx> {
229229
visited: BitSet<mir::BasicBlock>,
230230
visit_stack: Vec<mir::BasicBlock>,
231-
body: &'mir Body<'tcx>,
232-
regioncx: &'mir RegionInferenceContext<'tcx>,
231+
body: &'a Body<'tcx>,
232+
regioncx: &'a RegionInferenceContext<'tcx>,
233233

234234
loans_out_of_scope_at_location: FxIndexMap<Location, Vec<BorrowIndex>>,
235235
}
236236

237-
impl<'mir, 'tcx> PoloniusOutOfScopePrecomputer<'mir, 'tcx> {
238-
fn new(body: &'mir Body<'tcx>, regioncx: &'mir RegionInferenceContext<'tcx>) -> Self {
237+
impl<'a, 'tcx> PoloniusOutOfScopePrecomputer<'a, 'tcx> {
238+
fn new(body: &'a Body<'tcx>, regioncx: &'a RegionInferenceContext<'tcx>) -> Self {
239239
Self {
240240
visited: BitSet::new_empty(body.basic_blocks.len()),
241241
visit_stack: vec![],

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3540,7 +3540,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
35403540
location: Location,
35413541
mpi: MovePathIndex,
35423542
) -> (Vec<MoveSite>, Vec<Location>) {
3543-
fn predecessor_locations<'tcx, 'a>(
3543+
fn predecessor_locations<'a, 'tcx>(
35443544
body: &'a mir::Body<'tcx>,
35453545
location: Location,
35463546
) -> impl Iterator<Item = Location> + Captures<'tcx> + 'a {

‎compiler/rustc_borrowck/src/diagnostics/find_use.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ pub(crate) fn find<'tcx>(
2121
uf.find()
2222
}
2323

24-
struct UseFinder<'cx, 'tcx> {
25-
body: &'cx Body<'tcx>,
26-
regioncx: &'cx Rc<RegionInferenceContext<'tcx>>,
24+
struct UseFinder<'a, 'tcx> {
25+
body: &'a Body<'tcx>,
26+
regioncx: &'a Rc<RegionInferenceContext<'tcx>>,
2727
tcx: TyCtxt<'tcx>,
2828
region_vid: RegionVid,
2929
start_point: Location,
3030
}
3131

32-
impl<'cx, 'tcx> UseFinder<'cx, 'tcx> {
32+
impl<'a, 'tcx> UseFinder<'a, 'tcx> {
3333
fn find(&mut self) -> Option<Cause> {
3434
let mut queue = VecDeque::new();
3535
let mut visited = FxIndexSet::default();
@@ -93,8 +93,8 @@ impl<'cx, 'tcx> UseFinder<'cx, 'tcx> {
9393
}
9494
}
9595

96-
struct DefUseVisitor<'cx, 'tcx> {
97-
body: &'cx Body<'tcx>,
96+
struct DefUseVisitor<'a, 'tcx> {
97+
body: &'a Body<'tcx>,
9898
tcx: TyCtxt<'tcx>,
9999
region_vid: RegionVid,
100100
def_use_result: Option<DefUseResult>,
@@ -106,7 +106,7 @@ enum DefUseResult {
106106
UseDrop { local: Local },
107107
}
108108

109-
impl<'cx, 'tcx> Visitor<'tcx> for DefUseVisitor<'cx, 'tcx> {
109+
impl<'a, 'tcx> Visitor<'tcx> for DefUseVisitor<'a, 'tcx> {
110110
fn visit_local(&mut self, local: Local, context: PlaceContext, _: Location) {
111111
let local_ty = self.body.local_decls[local].ty;
112112

‎compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
558558
ty: Ty<'tcx>,
559559
suggested: bool,
560560
}
561-
impl<'a, 'cx, 'tcx> Visitor<'tcx> for SuggestIndexOperatorAlternativeVisitor<'a, 'cx, 'tcx> {
561+
impl<'a, 'infcx, 'tcx> Visitor<'tcx> for SuggestIndexOperatorAlternativeVisitor<'a, 'infcx, 'tcx> {
562562
fn visit_stmt(&mut self, stmt: &'tcx hir::Stmt<'tcx>) {
563563
hir::intravisit::walk_stmt(self, stmt);
564564
let expr = match stmt.kind {

‎compiler/rustc_borrowck/src/polonius/loan_invalidations.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ pub(super) fn emit_loan_invalidations<'tcx>(
3232
visitor.visit_body(body);
3333
}
3434

35-
struct LoanInvalidationsGenerator<'cx, 'tcx> {
35+
struct LoanInvalidationsGenerator<'a, 'tcx> {
3636
tcx: TyCtxt<'tcx>,
37-
all_facts: &'cx mut AllFacts,
38-
location_table: &'cx LocationTable,
39-
body: &'cx Body<'tcx>,
40-
dominators: &'cx Dominators<BasicBlock>,
41-
borrow_set: &'cx BorrowSet<'tcx>,
37+
all_facts: &'a mut AllFacts,
38+
location_table: &'a LocationTable,
39+
body: &'a Body<'tcx>,
40+
dominators: &'a Dominators<BasicBlock>,
41+
borrow_set: &'a BorrowSet<'tcx>,
4242
}
4343

4444
/// Visits the whole MIR and generates `invalidates()` facts.
4545
/// Most of the code implementing this was stolen from `borrow_check/mod.rs`.
46-
impl<'cx, 'tcx> Visitor<'tcx> for LoanInvalidationsGenerator<'cx, 'tcx> {
46+
impl<'a, 'tcx> Visitor<'tcx> for LoanInvalidationsGenerator<'a, 'tcx> {
4747
fn visit_statement(&mut self, statement: &Statement<'tcx>, location: Location) {
4848
self.check_activations(location);
4949

@@ -212,7 +212,7 @@ impl<'cx, 'tcx> Visitor<'tcx> for LoanInvalidationsGenerator<'cx, 'tcx> {
212212
}
213213
}
214214

215-
impl<'cx, 'tcx> LoanInvalidationsGenerator<'cx, 'tcx> {
215+
impl<'a, 'tcx> LoanInvalidationsGenerator<'a, 'tcx> {
216216
/// Simulates mutation of a place.
217217
fn mutate_place(&mut self, location: Location, place: Place<'tcx>, kind: AccessDepth) {
218218
self.access_place(

‎compiler/rustc_borrowck/src/polonius/loan_kills.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ pub(super) fn emit_loan_kills<'tcx>(
2525
}
2626
}
2727

28-
struct LoanKillsGenerator<'cx, 'tcx> {
28+
struct LoanKillsGenerator<'a, 'tcx> {
2929
tcx: TyCtxt<'tcx>,
30-
all_facts: &'cx mut AllFacts,
31-
location_table: &'cx LocationTable,
32-
borrow_set: &'cx BorrowSet<'tcx>,
33-
body: &'cx Body<'tcx>,
30+
all_facts: &'a mut AllFacts,
31+
location_table: &'a LocationTable,
32+
borrow_set: &'a BorrowSet<'tcx>,
33+
body: &'a Body<'tcx>,
3434
}
3535

36-
impl<'cx, 'tcx> Visitor<'tcx> for LoanKillsGenerator<'cx, 'tcx> {
36+
impl<'a, 'tcx> Visitor<'tcx> for LoanKillsGenerator<'a, 'tcx> {
3737
fn visit_statement(&mut self, statement: &Statement<'tcx>, location: Location) {
3838
// Also record CFG facts here.
3939
self.all_facts.cfg_edge.push((

‎compiler/rustc_borrowck/src/type_check/free_region_relations.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,12 @@ impl UniversalRegionRelations<'_> {
181181
}
182182
}
183183

184-
struct UniversalRegionRelationsBuilder<'this, 'tcx> {
185-
infcx: &'this InferCtxt<'tcx>,
184+
struct UniversalRegionRelationsBuilder<'a, 'tcx> {
185+
infcx: &'a InferCtxt<'tcx>,
186186
param_env: ty::ParamEnv<'tcx>,
187187
universal_regions: Rc<UniversalRegions<'tcx>>,
188188
implicit_region_bound: ty::Region<'tcx>,
189-
constraints: &'this mut MirTypeckRegionConstraints<'tcx>,
189+
constraints: &'a mut MirTypeckRegionConstraints<'tcx>,
190190

191191
// outputs:
192192
outlives: TransitiveRelationBuilder<RegionVid>,

‎compiler/rustc_borrowck/src/type_check/liveness/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,12 @@ fn record_regular_live_regions<'tcx>(
148148
}
149149

150150
/// Visitor looking for regions that should be live within rvalues or calls.
151-
struct LiveVariablesVisitor<'cx, 'tcx> {
151+
struct LiveVariablesVisitor<'a, 'tcx> {
152152
tcx: TyCtxt<'tcx>,
153-
liveness_constraints: &'cx mut LivenessValues,
153+
liveness_constraints: &'a mut LivenessValues,
154154
}
155155

156-
impl<'cx, 'tcx> Visitor<'tcx> for LiveVariablesVisitor<'cx, 'tcx> {
156+
impl<'a, 'tcx> Visitor<'tcx> for LiveVariablesVisitor<'a, 'tcx> {
157157
/// We sometimes have `args` within an rvalue, or within a
158158
/// call. Make them live at the location where they appear.
159159
fn visit_args(&mut self, args: &GenericArgsRef<'tcx>, location: Location) {
@@ -188,7 +188,7 @@ impl<'cx, 'tcx> Visitor<'tcx> for LiveVariablesVisitor<'cx, 'tcx> {
188188
}
189189
}
190190

191-
impl<'cx, 'tcx> LiveVariablesVisitor<'cx, 'tcx> {
191+
impl<'a, 'tcx> LiveVariablesVisitor<'a, 'tcx> {
192192
/// Some variable is "regular live" at `location` -- i.e., it may be used later. This means that
193193
/// all regions appearing in the type of `value` must be live at `location`.
194194
fn record_regions_live_at<T>(&mut self, value: T, location: Location)

‎compiler/rustc_borrowck/src/type_check/liveness/polonius.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ use crate::location::{LocationIndex, LocationTable};
1111
type VarPointRelation = Vec<(Local, LocationIndex)>;
1212
type PathPointRelation = Vec<(MovePathIndex, LocationIndex)>;
1313

14-
struct UseFactsExtractor<'me, 'tcx> {
15-
var_defined_at: &'me mut VarPointRelation,
16-
var_used_at: &'me mut VarPointRelation,
17-
location_table: &'me LocationTable,
18-
var_dropped_at: &'me mut VarPointRelation,
19-
move_data: &'me MoveData<'tcx>,
20-
path_accessed_at_base: &'me mut PathPointRelation,
14+
struct UseFactsExtractor<'a, 'tcx> {
15+
var_defined_at: &'a mut VarPointRelation,
16+
var_used_at: &'a mut VarPointRelation,
17+
location_table: &'a LocationTable,
18+
var_dropped_at: &'a mut VarPointRelation,
19+
move_data: &'a MoveData<'tcx>,
20+
path_accessed_at_base: &'a mut PathPointRelation,
2121
}
2222

2323
// A Visitor to walk through the MIR and extract point-wise facts

‎compiler/rustc_builtin_macros/src/global_allocator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ struct AllocFnFactory<'a, 'b> {
6565
span: Span,
6666
ty_span: Span,
6767
global: Ident,
68-
cx: &'b ExtCtxt<'a>,
68+
cx: &'a ExtCtxt<'b>,
6969
}
7070

7171
impl AllocFnFactory<'_, '_> {

‎compiler/rustc_const_eval/src/check_consts/check.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@ impl<'mir, 'tcx> Qualifs<'mir, 'tcx> {
166166
}
167167
}
168168

169-
struct LocalReturnTyVisitor<'ck, 'mir, 'tcx> {
169+
struct LocalReturnTyVisitor<'a, 'mir, 'tcx> {
170170
kind: LocalKind,
171-
checker: &'ck mut Checker<'mir, 'tcx>,
171+
checker: &'a mut Checker<'mir, 'tcx>,
172172
}
173173

174-
impl<'ck, 'mir, 'tcx> TypeVisitor<TyCtxt<'tcx>> for LocalReturnTyVisitor<'ck, 'mir, 'tcx> {
174+
impl<'a, 'mir, 'tcx> TypeVisitor<TyCtxt<'tcx>> for LocalReturnTyVisitor<'a, 'mir, 'tcx> {
175175
fn visit_ty(&mut self, t: Ty<'tcx>) {
176176
match t.kind() {
177177
ty::FnPtr(..) => {}

‎compiler/rustc_const_eval/src/interpret/memory.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> std::fmt::Debug for DumpAllocs<'a, 'tcx, M> {
11141114
}
11151115

11161116
/// Reading and writing.
1117-
impl<'tcx, 'a, Prov: Provenance, Extra, Bytes: AllocBytes>
1117+
impl<'a, 'tcx, Prov: Provenance, Extra, Bytes: AllocBytes>
11181118
AllocRefMut<'a, 'tcx, Prov, Extra, Bytes>
11191119
{
11201120
pub fn as_ref<'b>(&'b self) -> AllocRef<'b, 'tcx, Prov, Extra, Bytes> {
@@ -1162,7 +1162,7 @@ impl<'tcx, 'a, Prov: Provenance, Extra, Bytes: AllocBytes>
11621162
}
11631163
}
11641164

1165-
impl<'tcx, 'a, Prov: Provenance, Extra, Bytes: AllocBytes> AllocRef<'a, 'tcx, Prov, Extra, Bytes> {
1165+
impl<'a, 'tcx, Prov: Provenance, Extra, Bytes: AllocBytes> AllocRef<'a, 'tcx, Prov, Extra, Bytes> {
11661166
/// `range` is relative to this allocation reference, not the base of the allocation.
11671167
pub fn read_scalar(
11681168
&self,

‎compiler/rustc_const_eval/src/interpret/projection.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ pub trait Projectable<'tcx, Prov: Provenance>: Sized + std::fmt::Debug {
101101
}
102102

103103
/// A type representing iteration over the elements of an array.
104-
pub struct ArrayIterator<'tcx, 'a, Prov: Provenance, P: Projectable<'tcx, Prov>> {
104+
pub struct ArrayIterator<'a, 'tcx, Prov: Provenance, P: Projectable<'tcx, Prov>> {
105105
base: &'a P,
106106
range: Range<u64>,
107107
stride: Size,
108108
field_layout: TyAndLayout<'tcx>,
109109
_phantom: PhantomData<Prov>, // otherwise it says `Prov` is never used...
110110
}
111111

112-
impl<'tcx, 'a, Prov: Provenance, P: Projectable<'tcx, Prov>> ArrayIterator<'tcx, 'a, Prov, P> {
112+
impl<'a, 'tcx, Prov: Provenance, P: Projectable<'tcx, Prov>> ArrayIterator<'a, 'tcx, Prov, P> {
113113
/// Should be the same `ecx` on each call, and match the one used to create the iterator.
114114
pub fn next<M: Machine<'tcx, Provenance = Prov>>(
115115
&mut self,
@@ -273,7 +273,7 @@ where
273273
pub fn project_array_fields<'a, P: Projectable<'tcx, M::Provenance>>(
274274
&self,
275275
base: &'a P,
276-
) -> InterpResult<'tcx, ArrayIterator<'tcx, 'a, M::Provenance, P>> {
276+
) -> InterpResult<'tcx, ArrayIterator<'a, 'tcx, M::Provenance, P>> {
277277
let abi::FieldsShape::Array { stride, .. } = base.layout().fields else {
278278
span_bug!(self.cur_span(), "project_array_fields: expected an array layout");
279279
};

0 commit comments

Comments
 (0)