Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e96b4e4
coverage: Extract `executor::block_on` from several async coverage tests
Zalathar Sep 6, 2024
d0be42d
Remove unnecessary lifetime from `UnsafeInferVarsVisitor`.
nnethercote Sep 6, 2024
0b2235d
Stabilize entry_insert
passcod Sep 12, 2024
c1121f8
Remove unnecessary lifetime from `FeaturePreviouslyDeclared`.
nnethercote Sep 10, 2024
5138399
Remove unnecessary lifetime from `BuiltinTypeAliasBounds`.
nnethercote Sep 11, 2024
0b59bba
Remove unnecessary lifetime from `CheckLoopVisitor`.
nnethercote Sep 12, 2024
65863c5
Remove unnecessary lifetimes from `Arena`.
nnethercote Sep 11, 2024
7b613ed
Remove unnecessary lifetimes from `rustc_expand`.
nnethercote Sep 12, 2024
072bf48
Remove unnecessary lifetime from `RunCompiler`.
nnethercote Sep 12, 2024
606b9cb
Rename some lifetimes.
nnethercote Sep 10, 2024
8d32578
Rename and reorder lots of lifetimes.
nnethercote Sep 11, 2024
359b658
Remove `sess` from `CheckLoopVisitor`.
nnethercote Sep 13, 2024
14285e9
docs: Enable required feature for 'closure_returning_async_block' lint
Fayti1703 Sep 14, 2024
003da02
Add `ErrorGuaranteed` to `DestructuredFloat::Error`
ShE3py Sep 14, 2024
3d20c81
Fix `Parser::break_up_float`'s right span
ShE3py Sep 14, 2024
4cb5849
Refactor `Parser::break_up_float`
ShE3py Sep 14, 2024
60ee1b7
simd_shuffle: require index argument to be a vector
RalfJung Sep 12, 2024
2b12b57
Rollup merge of #130017 - Zalathar:executor, r=Mark-Simulacrum
fmease Sep 14, 2024
a9dcd7f
Rollup merge of #130268 - RalfJung:simd-shuffle-idx-vector, r=compile…
fmease Sep 14, 2024
f873367
Rollup merge of #130290 - passcod:stabilise-entry-insert, r=ChrisDenton
fmease Sep 14, 2024
03e8b6b
Rollup merge of #130294 - nnethercote:more-lifetimes, r=lcnr
fmease Sep 14, 2024
d1701a5
Rollup merge of #130343 - Fayti1703:patch-correct-async-block-lint-do…
fmease Sep 14, 2024
2b40fdb
Rollup merge of #130349 - ShE3py:break_up_float, r=fmease
fmease Sep 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename some lifetimes.
Giving them more typical names.
  • Loading branch information
nnethercote committed Sep 13, 2024
commit 606b9cb4066ba5649ab0fd9d29d86cc97a7b8950
12 changes: 6 additions & 6 deletions compiler/rustc_borrowck/src/type_check/relate_tys.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
}
}

struct NllTypeRelating<'me, 'bccx, 'tcx> {
type_checker: &'me mut TypeChecker<'bccx, 'tcx>,
struct NllTypeRelating<'a, 'b, 'tcx> {
type_checker: &'a mut TypeChecker<'b, 'tcx>,

/// Where (and why) is this relation taking place?
locations: Locations,
Expand All @@ -82,9 +82,9 @@ struct NllTypeRelating<'me, 'bccx, 'tcx> {
ambient_variance_info: ty::VarianceDiagInfo<TyCtxt<'tcx>>,
}

impl<'me, 'bccx, 'tcx> NllTypeRelating<'me, 'bccx, 'tcx> {
impl<'a, 'b, 'tcx> NllTypeRelating<'a, 'b, 'tcx> {
fn new(
type_checker: &'me mut TypeChecker<'bccx, 'tcx>,
type_checker: &'a mut TypeChecker<'b, 'tcx>,
locations: Locations,
category: ConstraintCategory<'tcx>,
universe_info: UniverseInfo<'tcx>,
Expand Down Expand Up @@ -309,7 +309,7 @@ impl<'me, 'bccx, 'tcx> NllTypeRelating<'me, 'bccx, 'tcx> {
}
}

impl<'bccx, 'tcx> TypeRelation<TyCtxt<'tcx>> for NllTypeRelating<'_, 'bccx, 'tcx> {
impl<'b, 'tcx> TypeRelation<TyCtxt<'tcx>> for NllTypeRelating<'_, 'b, 'tcx> {
fn cx(&self) -> TyCtxt<'tcx> {
self.type_checker.infcx.tcx
}
Expand Down Expand Up @@ -520,7 +520,7 @@ impl<'bccx, 'tcx> TypeRelation<TyCtxt<'tcx>> for NllTypeRelating<'_, 'bccx, 'tcx
}
}

impl<'bccx, 'tcx> PredicateEmittingRelation<InferCtxt<'tcx>> for NllTypeRelating<'_, 'bccx, 'tcx> {
impl<'b, 'tcx> PredicateEmittingRelation<InferCtxt<'tcx>> for NllTypeRelating<'_, 'b, 'tcx> {
fn span(&self) -> Span {
self.locations.span(self.type_checker.body)
}
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_mir_dataflow/src/elaborate_drops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ pub trait DropElaborator<'a, 'tcx>: fmt::Debug {
}

#[derive(Debug)]
struct DropCtxt<'l, 'b, 'tcx, D>
struct DropCtxt<'a, 'b, 'tcx, D>
where
D: DropElaborator<'b, 'tcx>,
{
elaborator: &'l mut D,
elaborator: &'a mut D,

source_info: SourceInfo,

Expand Down Expand Up @@ -192,7 +192,7 @@ pub fn elaborate_drop<'b, 'tcx, D>(
DropCtxt { elaborator, source_info, place, path, succ, unwind }.elaborate_drop(bb)
}

impl<'l, 'b, 'tcx, D> DropCtxt<'l, 'b, 'tcx, D>
impl<'a, 'b, 'tcx, D> DropCtxt<'a, 'b, 'tcx, D>
where
D: DropElaborator<'b, 'tcx>,
'tcx: 'b,
Expand Down