Skip to content

Commit 192ad03

Browse files
compiler-errorscompiler-errors
committed
Remove unncessary outlives and captures from RPITs
1 parent 5a22964 commit 192ad03

File tree

95 files changed

+179
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+179
-231
lines changed

‎compiler/rustc_abi/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ impl<FieldIdx: Idx> FieldsShape<FieldIdx> {
12511251

12521252
/// Gets source indices of the fields by increasing offsets.
12531253
#[inline]
1254-
pub fn index_by_increasing_offset(&self) -> impl ExactSizeIterator<Item = usize> + '_ {
1254+
pub fn index_by_increasing_offset(&self) -> impl ExactSizeIterator<Item = usize> {
12551255
let mut inverse_small = [0u8; 64];
12561256
let mut inverse_big = IndexVec::new();
12571257
let use_small = self.count() <= inverse_small.len();

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ use rustc_ast::node_id::NodeMap;
4545
use rustc_ast::ptr::P;
4646
use rustc_ast::{self as ast, *};
4747
use rustc_ast_pretty::pprust;
48-
use rustc_data_structures::captures::Captures;
4948
use rustc_data_structures::fingerprint::Fingerprint;
5049
use rustc_data_structures::fx::FxIndexSet;
5150
use rustc_data_structures::sorted_map::SortedMap;
@@ -2101,7 +2100,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
21012100
&'s mut self,
21022101
params: &'s [GenericParam],
21032102
source: hir::GenericParamSource,
2104-
) -> impl Iterator<Item = hir::GenericParam<'hir>> + Captures<'a> + Captures<'s> {
2103+
) -> impl Iterator<Item = hir::GenericParam<'hir>> {
21052104
params.iter().map(move |param| self.lower_generic_param(param, source))
21062105
}
21072106

@@ -2265,7 +2264,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
22652264
&'s mut self,
22662265
bounds: &'s [GenericBound],
22672266
itctx: ImplTraitContext,
2268-
) -> impl Iterator<Item = hir::GenericBound<'hir>> + Captures<'s> + Captures<'a> {
2267+
) -> impl Iterator<Item = hir::GenericBound<'hir>> {
22692268
bounds.iter().map(move |bound| self.lower_param_bound(bound, itctx))
22702269
}
22712270

‎compiler/rustc_attr/src/builtin.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,22 +1166,22 @@ pub fn find_transparency(
11661166
pub fn allow_internal_unstable<'a>(
11671167
sess: &'a Session,
11681168
attrs: &'a [Attribute],
1169-
) -> impl Iterator<Item = Symbol> + 'a {
1169+
) -> impl Iterator<Item = Symbol> {
11701170
allow_unstable(sess, attrs, sym::allow_internal_unstable)
11711171
}
11721172

11731173
pub fn rustc_allow_const_fn_unstable<'a>(
11741174
sess: &'a Session,
11751175
attrs: &'a [Attribute],
1176-
) -> impl Iterator<Item = Symbol> + 'a {
1176+
) -> impl Iterator<Item = Symbol> {
11771177
allow_unstable(sess, attrs, sym::rustc_allow_const_fn_unstable)
11781178
}
11791179

11801180
fn allow_unstable<'a>(
11811181
sess: &'a Session,
11821182
attrs: &'a [Attribute],
11831183
symbol: Symbol,
1184-
) -> impl Iterator<Item = Symbol> + 'a {
1184+
) -> impl Iterator<Item = Symbol> {
11851185
let attrs = attr::filter_by_name(attrs, symbol);
11861186
let list = attrs
11871187
.filter_map(move |attr| {

‎compiler/rustc_borrowck/src/borrow_set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ impl<'tcx> BorrowSet<'tcx> {
159159
self.location_map.len()
160160
}
161161

162-
pub(crate) fn indices(&self) -> impl Iterator<Item = BorrowIndex> {
162+
pub(crate) fn indices(&self) -> impl Iterator<Item = BorrowIndex> + 'static {
163163
BorrowIndex::ZERO..BorrowIndex::from_usize(self.len())
164164
}
165165

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use std::ops::ControlFlow;
88

99
use either::Either;
1010
use hir::{ClosureKind, Path};
11-
use rustc_data_structures::captures::Captures;
1211
use rustc_data_structures::fx::FxIndexSet;
1312
use rustc_errors::codes::*;
1413
use rustc_errors::{struct_span_code_err, Applicability, Diag, MultiSpan};
@@ -3544,7 +3543,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, '_, 'infcx, 'tcx> {
35443543
fn predecessor_locations<'tcx, 'a>(
35453544
body: &'a mir::Body<'tcx>,
35463545
location: Location,
3547-
) -> impl Iterator<Item = Location> + Captures<'tcx> + 'a {
3546+
) -> impl Iterator<Item = Location> {
35483547
if location.statement_index == 0 {
35493548
let predecessors = body.basic_blocks.predecessors()[location.block].to_vec();
35503549
Either::Left(predecessors.into_iter().map(move |bb| body.terminator_loc(bb)))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, '_, 'infcx, 'tcx> {
824824
/// help: to allow this `impl Trait` to capture borrowed data with lifetime `'1`, add `'_` as
825825
/// a constraint
826826
/// |
827-
/// LL | fn iter_values_anon(&self) -> impl Iterator<Item=u32> + 'a {
827+
/// LL | fn iter_values_anon(&self) -> impl Iterator<Item=u32> {
828828
/// | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
829829
/// ```
830830
#[allow(rustc::diagnostic_outside_of_impl)]

‎compiler/rustc_borrowck/src/member_constraints.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use std::hash::Hash;
22
use std::ops::Index;
33

4-
use rustc_data_structures::captures::Captures;
54
use rustc_data_structures::fx::FxIndexMap;
65
use rustc_index::{IndexSlice, IndexVec};
76
use rustc_middle::infer::MemberConstraint;
@@ -150,9 +149,7 @@ impl<'tcx, R> MemberConstraintSet<'tcx, R>
150149
where
151150
R: Copy + Hash + Eq,
152151
{
153-
pub(crate) fn all_indices(
154-
&self,
155-
) -> impl Iterator<Item = NllMemberConstraintIndex> + Captures<'tcx> + '_ {
152+
pub(crate) fn all_indices(&self) -> impl Iterator<Item = NllMemberConstraintIndex> {
156153
self.constraints.indices()
157154
}
158155

@@ -162,7 +159,7 @@ where
162159
pub(crate) fn indices(
163160
&self,
164161
member_region_vid: R,
165-
) -> impl Iterator<Item = NllMemberConstraintIndex> + Captures<'tcx> + '_ {
162+
) -> impl Iterator<Item = NllMemberConstraintIndex> {
166163
let mut next = self.first_constraints.get(&member_region_vid).cloned();
167164
std::iter::from_fn(move || -> Option<NllMemberConstraintIndex> {
168165
if let Some(current) = next {

‎compiler/rustc_borrowck/src/region_infer/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
552552
}
553553

554554
/// Returns an iterator over all the region indices.
555-
pub fn regions(&self) -> impl Iterator<Item = RegionVid> + 'tcx {
555+
pub fn regions(&self) -> impl Iterator<Item = RegionVid> {
556556
self.definitions.indices()
557557
}
558558

@@ -565,7 +565,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
565565
}
566566

567567
/// Returns an iterator over all the outlives constraints.
568-
pub fn outlives_constraints(&self) -> impl Iterator<Item = OutlivesConstraint<'tcx>> + '_ {
568+
pub fn outlives_constraints(&self) -> impl Iterator<Item = OutlivesConstraint<'tcx>> {
569569
self.constraints.outlives().iter().copied()
570570
}
571571

@@ -605,7 +605,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
605605
pub(crate) fn placeholders_contained_in<'a>(
606606
&'a self,
607607
r: RegionVid,
608-
) -> impl Iterator<Item = ty::PlaceholderRegion> + 'a {
608+
) -> impl Iterator<Item = ty::PlaceholderRegion> {
609609
let scc = self.constraint_sccs.scc(r);
610610
self.scc_values.placeholders_contained_in(scc)
611611
}

‎compiler/rustc_borrowck/src/region_infer/reverse_sccs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ impl ReverseSccGraph {
2323
pub(super) fn upper_bounds<'a>(
2424
&'a self,
2525
scc0: ConstraintSccIndex,
26-
) -> impl Iterator<Item = RegionVid> + 'a {
26+
) -> impl Iterator<Item = RegionVid> {
2727
let mut duplicates = FxIndexSet::default();
2828
graph::depth_first_search(&self.graph, scc0)
2929
.flat_map(move |scc1| {

‎compiler/rustc_borrowck/src/region_infer/values.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ impl LivenessValues {
9999
}
100100

101101
/// Iterate through each region that has a value in this set.
102-
pub(crate) fn regions(&self) -> impl Iterator<Item = RegionVid> + '_ {
102+
pub(crate) fn regions(&self) -> impl Iterator<Item = RegionVid> {
103103
self.points.as_ref().expect("use with_specific_points").rows()
104104
}
105105

106106
/// Iterate through each region that has a value in this set.
107107
// We are passing query instability implications to the caller.
108108
#[rustc_lint_query_instability]
109109
#[allow(rustc::potential_query_instability)]
110-
pub(crate) fn live_regions_unordered(&self) -> impl Iterator<Item = RegionVid> + '_ {
110+
pub(crate) fn live_regions_unordered(&self) -> impl Iterator<Item = RegionVid> {
111111
self.live_regions.as_ref().unwrap().iter().copied()
112112
}
113113

@@ -176,7 +176,7 @@ impl LivenessValues {
176176
}
177177

178178
/// Returns an iterator of all the points where `region` is live.
179-
fn live_points(&self, region: RegionVid) -> impl Iterator<Item = PointIndex> + '_ {
179+
fn live_points(&self, region: RegionVid) -> impl Iterator<Item = PointIndex> {
180180
let Some(points) = &self.points else {
181181
unreachable!(
182182
"Should be using LivenessValues::with_specific_points to ask whether live at a location"
@@ -362,7 +362,7 @@ impl<N: Idx> RegionValues<N> {
362362
}
363363

364364
/// Returns the locations contained within a given region `r`.
365-
pub(crate) fn locations_outlived_by<'a>(&'a self, r: N) -> impl Iterator<Item = Location> + 'a {
365+
pub(crate) fn locations_outlived_by<'a>(&'a self, r: N) -> impl Iterator<Item = Location> {
366366
self.points.row(r).into_iter().flat_map(move |set| {
367367
set.iter()
368368
.take_while(move |&p| self.elements.point_in_range(p))
@@ -374,15 +374,15 @@ impl<N: Idx> RegionValues<N> {
374374
pub(crate) fn universal_regions_outlived_by<'a>(
375375
&'a self,
376376
r: N,
377-
) -> impl Iterator<Item = RegionVid> + 'a {
377+
) -> impl Iterator<Item = RegionVid> {
378378
self.free_regions.row(r).into_iter().flat_map(|set| set.iter())
379379
}
380380

381381
/// Returns all the elements contained in a given region's value.
382382
pub(crate) fn placeholders_contained_in<'a>(
383383
&'a self,
384384
r: N,
385-
) -> impl Iterator<Item = ty::PlaceholderRegion> + 'a {
385+
) -> impl Iterator<Item = ty::PlaceholderRegion> {
386386
self.placeholders
387387
.row(r)
388388
.into_iter()
@@ -391,10 +391,7 @@ impl<N: Idx> RegionValues<N> {
391391
}
392392

393393
/// Returns all the elements contained in a given region's value.
394-
pub(crate) fn elements_contained_in<'a>(
395-
&'a self,
396-
r: N,
397-
) -> impl Iterator<Item = RegionElement> + 'a {
394+
pub(crate) fn elements_contained_in<'a>(&'a self, r: N) -> impl Iterator<Item = RegionElement> {
398395
let points_iter = self.locations_outlived_by(r).map(RegionElement::Location);
399396

400397
let free_regions_iter =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ impl UniversalRegionRelations<'_> {
175175
}
176176

177177
/// Returns the _non-transitive_ set of known `outlives` constraints between free regions.
178-
pub(crate) fn known_outlives(&self) -> impl Iterator<Item = (RegionVid, RegionVid)> + '_ {
178+
pub(crate) fn known_outlives(&self) -> impl Iterator<Item = (RegionVid, RegionVid)> {
179179
self.outlives.base_edges()
180180
}
181181
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ rustc_index::newtype_index! {
5454
fn appearances_iter(
5555
first: Option<AppearanceIndex>,
5656
appearances: &Appearances,
57-
) -> impl Iterator<Item = AppearanceIndex> + '_ {
57+
) -> impl Iterator<Item = AppearanceIndex> {
5858
AppearancesIter { appearances, current: first }
5959
}
6060

@@ -107,17 +107,17 @@ impl LocalUseMap {
107107
local_use_map
108108
}
109109

110-
pub(crate) fn defs(&self, local: Local) -> impl Iterator<Item = PointIndex> + '_ {
110+
pub(crate) fn defs(&self, local: Local) -> impl Iterator<Item = PointIndex> {
111111
appearances_iter(self.first_def_at[local], &self.appearances)
112112
.map(move |aa| self.appearances[aa].point_index)
113113
}
114114

115-
pub(crate) fn uses(&self, local: Local) -> impl Iterator<Item = PointIndex> + '_ {
115+
pub(crate) fn uses(&self, local: Local) -> impl Iterator<Item = PointIndex> {
116116
appearances_iter(self.first_use_at[local], &self.appearances)
117117
.map(move |aa| self.appearances[aa].point_index)
118118
}
119119

120-
pub(crate) fn drops(&self, local: Local) -> impl Iterator<Item = PointIndex> + '_ {
120+
pub(crate) fn drops(&self, local: Local) -> impl Iterator<Item = PointIndex> {
121121
appearances_iter(self.first_drop_at[local], &self.appearances)
122122
.map(move |aa| self.appearances[aa].point_index)
123123
}

‎compiler/rustc_borrowck/src/universal_regions.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ impl<'tcx> UniversalRegions<'tcx> {
310310

311311
/// Returns an iterator over all the RegionVids corresponding to
312312
/// universally quantified free regions.
313-
pub fn universal_regions(&self) -> impl Iterator<Item = RegionVid> {
313+
pub fn universal_regions(&self) -> impl Iterator<Item = RegionVid> + 'static {
314314
(FIRST_GLOBAL_INDEX..self.num_universals).map(RegionVid::from_usize)
315315
}
316316

@@ -336,7 +336,7 @@ impl<'tcx> UniversalRegions<'tcx> {
336336
/// Gets an iterator over all the early-bound regions that have names.
337337
pub fn named_universal_regions<'s>(
338338
&'s self,
339-
) -> impl Iterator<Item = (ty::Region<'tcx>, ty::RegionVid)> + 's {
339+
) -> impl Iterator<Item = (ty::Region<'tcx>, ty::RegionVid)> {
340340
self.indices.indices.iter().map(|(&r, &v)| (r, v))
341341
}
342342

‎compiler/rustc_codegen_gcc/build_system/src/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@ fn test_failing_ui_pattern_tests(env: &Env, args: &TestArg) -> Result<(), String
10861086
fn retain_files_callback<'a>(
10871087
file_path: &'a str,
10881088
test_type: &'a str,
1089-
) -> impl Fn(&Path) -> Result<bool, String> + 'a {
1089+
) -> impl Fn(&Path) -> Result<bool, String> {
10901090
move |rust_path| {
10911091
let files = std::fs::read_to_string(file_path).unwrap_or_default();
10921092
let first_file_name = files.lines().next().unwrap_or("");
@@ -1149,7 +1149,7 @@ fn retain_files_callback<'a>(
11491149
fn remove_files_callback<'a>(
11501150
file_path: &'a str,
11511151
test_type: &'a str,
1152-
) -> impl Fn(&Path) -> Result<bool, String> + 'a {
1152+
) -> impl Fn(&Path) -> Result<bool, String> {
11531153
move |rust_path| {
11541154
let files = std::fs::read_to_string(file_path).unwrap_or_default();
11551155
let first_file_name = files.lines().next().unwrap_or("");

‎compiler/rustc_codegen_llvm/src/coverageinfo/map_data.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use rustc_data_structures::captures::Captures;
21
use rustc_data_structures::fx::FxIndexSet;
32
use rustc_index::bit_set::BitSet;
43
use rustc_middle::mir::coverage::{
@@ -200,15 +199,15 @@ impl<'tcx> FunctionCoverage<'tcx> {
200199
}
201200

202201
/// Returns an iterator over all filenames used by this function's mappings.
203-
pub(crate) fn all_file_names(&self) -> impl Iterator<Item = Symbol> + Captures<'_> {
202+
pub(crate) fn all_file_names(&self) -> impl Iterator<Item = Symbol> {
204203
self.function_coverage_info.mappings.iter().map(|mapping| mapping.code_region.file_name)
205204
}
206205

207206
/// Convert this function's coverage expression data into a form that can be
208207
/// passed through FFI to LLVM.
209208
pub(crate) fn counter_expressions(
210209
&self,
211-
) -> impl Iterator<Item = CounterExpression> + ExactSizeIterator + Captures<'_> {
210+
) -> impl Iterator<Item = CounterExpression> + ExactSizeIterator {
212211
// We know that LLVM will optimize out any unused expressions before
213212
// producing the final coverage map, so there's no need to do the same
214213
// thing on the Rust side unless we're confident we can do much better.

‎compiler/rustc_codegen_ssa/src/mir/locals.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl<'tcx, V> Locals<'tcx, V> {
3232
Locals { values: IndexVec::default() }
3333
}
3434

35-
pub(super) fn indices(&self) -> impl DoubleEndedIterator<Item = mir::Local> + Clone + 'tcx {
35+
pub(super) fn indices(&self) -> impl DoubleEndedIterator<Item = mir::Local> + Clone + 'static {
3636
self.values.indices()
3737
}
3838
}

‎compiler/rustc_data_structures/src/graph/implementation/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@ impl<N: Debug, E: Debug> Graph<N, E> {
193193
AdjacentEdges { graph: self, direction, next: first_edge }
194194
}
195195

196-
pub fn successor_nodes(&self, source: NodeIndex) -> impl Iterator<Item = NodeIndex> + '_ {
196+
pub fn successor_nodes(&self, source: NodeIndex) -> impl Iterator<Item = NodeIndex> {
197197
self.outgoing_edges(source).targets()
198198
}
199199

200-
pub fn predecessor_nodes(&self, target: NodeIndex) -> impl Iterator<Item = NodeIndex> + '_ {
200+
pub fn predecessor_nodes(&self, target: NodeIndex) -> impl Iterator<Item = NodeIndex> {
201201
self.incoming_edges(target).sources()
202202
}
203203

@@ -255,11 +255,11 @@ pub struct AdjacentEdges<'g, N, E> {
255255
}
256256

257257
impl<'g, N: Debug, E: Debug> AdjacentEdges<'g, N, E> {
258-
fn targets(self) -> impl Iterator<Item = NodeIndex> + 'g {
258+
fn targets(self) -> impl Iterator<Item = NodeIndex> {
259259
self.map(|(_, edge)| edge.target)
260260
}
261261

262-
fn sources(self) -> impl Iterator<Item = NodeIndex> + 'g {
262+
fn sources(self) -> impl Iterator<Item = NodeIndex> {
263263
self.map(|(_, edge)| edge.source)
264264
}
265265
}

‎compiler/rustc_data_structures/src/graph/scc/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ impl<N: Idx, S: Idx + Ord, A: Annotation> Sccs<N, S, A> {
133133
/// meaning that if `S1 -> S2`, we will visit `S2` first and `S1` after.
134134
/// This is convenient when the edges represent dependencies: when you visit
135135
/// `S1`, the value for `S2` will already have been computed.
136-
pub fn all_sccs(&self) -> impl Iterator<Item = S> {
136+
pub fn all_sccs(&self) -> impl Iterator<Item = S> + 'static {
137137
(0..self.scc_data.len()).map(S::new)
138138
}
139139

0 commit comments

Comments
 (0)