Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lifetime cleanups #130294

Merged
merged 10 commits into from
Sep 14, 2024
Merged

Lifetime cleanups #130294

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d0be42d
Remove unnecessary lifetime from `UnsafeInferVarsVisitor`.
nnethercote Sep 6, 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
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
12 changes: 6 additions & 6 deletions compiler/rustc_passes/src/loops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ impl fmt::Display for BreakContextKind {
}

#[derive(Clone)]
struct CheckLoopVisitor<'a, 'tcx> {
sess: &'a Session,
struct CheckLoopVisitor<'tcx> {
sess: &'tcx Session,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can get the session from the tcx, the field can be removed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a commit doing that.

tcx: TyCtxt<'tcx>,
// Keep track of a stack of contexts, so that suggestions
// are not made for contexts where it would be incorrect,
Expand All @@ -90,7 +90,7 @@ pub(crate) fn provide(providers: &mut Providers) {
*providers = Providers { check_mod_loops, ..*providers };
}

impl<'a, 'hir> Visitor<'hir> for CheckLoopVisitor<'a, 'hir> {
impl<'hir> Visitor<'hir> for CheckLoopVisitor<'hir> {
type NestedFilter = nested_filter::OnlyBodies;

fn nested_visit_map(&mut self) -> Self::Map {
Expand Down Expand Up @@ -129,7 +129,7 @@ impl<'a, 'hir> Visitor<'hir> for CheckLoopVisitor<'a, 'hir> {
hir::ExprKind::If(cond, then, else_opt) => {
self.visit_expr(cond);

let get_block = |ck_loop: &CheckLoopVisitor<'a, 'hir>,
let get_block = |ck_loop: &CheckLoopVisitor<'hir>,
expr: &hir::Expr<'hir>|
-> Option<&hir::Block<'hir>> {
if let hir::ExprKind::Block(b, None) = expr.kind
Expand Down Expand Up @@ -306,10 +306,10 @@ impl<'a, 'hir> Visitor<'hir> for CheckLoopVisitor<'a, 'hir> {
}
}

impl<'a, 'hir> CheckLoopVisitor<'a, 'hir> {
impl<'hir> CheckLoopVisitor<'hir> {
fn with_context<F>(&mut self, cx: Context, f: F)
where
F: FnOnce(&mut CheckLoopVisitor<'a, 'hir>),
F: FnOnce(&mut CheckLoopVisitor<'hir>),
{
self.cx_stack.push(cx);
f(self);
Expand Down