Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit de6db15

Browse files
committedMay 29, 2025·
Auto merge of #141739 - GuillaumeGomez:rollup-ivboqwd, r=GuillaumeGomez
Rollup of 11 pull requests Successful merges: - #137574 (Make `std/src/num` mirror `core/src/num`) - #141384 (Enable review queue tracking) - #141448 (A variety of improvements to the codegen backends) - #141636 (avoid some usages of `&mut P<T>` in AST visitors) - #141676 (float: Disable `total_cmp` sNaN tests for `f16`) - #141705 (Add eslint as part of `tidy` run) - #141715 (Add `loongarch64` with `d` feature to `f32::midpoint` fast path) - #141723 (Provide secrets to try builds with new bors) - #141728 (Fix false documentation of FnCtxt::diverges) - #141729 (resolve target-libdir directly from rustc) - #141732 (creader: Remove extraenous String::clone) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 13718eb + 18646a8 commit de6db15

File tree

54 files changed

+348
-275
lines changed

Some content is hidden

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

54 files changed

+348
-275
lines changed
 

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ concurrency:
3434
# For a given workflow, if we push to the same branch, cancel all previous builds on that branch.
3535
# We add an exception for try builds (try branch) and unrolled rollup builds (try-perf), which
3636
# are all triggered on the same branch, but which should be able to run concurrently.
37-
group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}
37+
group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try') && github.sha) || github.ref }}
3838
cancel-in-progress: true
3939
env:
4040
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
@@ -80,7 +80,7 @@ jobs:
8080
# access the environment.
8181
#
8282
# We only enable the environment for the rust-lang/rust repository, so that CI works on forks.
83-
environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/auto')) && 'bors') || '' }}
83+
environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/auto')) && 'bors') || '' }}
8484
env:
8585
CI_JOB_NAME: ${{ matrix.name }}
8686
CI_JOB_DOC_URL: ${{ matrix.doc_url }}

‎compiler/rustc_ast/src/mut_visit.rs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ pub trait MutVisitor: Sized {
7777
walk_use_tree(self, use_tree);
7878
}
7979

80-
fn visit_foreign_item(&mut self, ni: &mut P<ForeignItem>) {
80+
fn visit_foreign_item(&mut self, ni: &mut ForeignItem) {
8181
walk_item(self, ni);
8282
}
8383

8484
fn flat_map_foreign_item(&mut self, ni: P<ForeignItem>) -> SmallVec<[P<ForeignItem>; 1]> {
8585
walk_flat_map_foreign_item(self, ni)
8686
}
8787

88-
fn visit_item(&mut self, i: &mut P<Item>) {
88+
fn visit_item(&mut self, i: &mut Item) {
8989
walk_item(self, i);
9090
}
9191

@@ -105,7 +105,7 @@ pub trait MutVisitor: Sized {
105105
walk_flat_map_field_def(self, fd)
106106
}
107107

108-
fn visit_assoc_item(&mut self, i: &mut P<AssocItem>, ctxt: AssocCtxt) {
108+
fn visit_assoc_item(&mut self, i: &mut AssocItem, ctxt: AssocCtxt) {
109109
walk_assoc_item(self, i, ctxt)
110110
}
111111

@@ -117,11 +117,11 @@ pub trait MutVisitor: Sized {
117117
walk_flat_map_assoc_item(self, i, ctxt)
118118
}
119119

120-
fn visit_contract(&mut self, c: &mut P<FnContract>) {
120+
fn visit_contract(&mut self, c: &mut FnContract) {
121121
walk_contract(self, c);
122122
}
123123

124-
fn visit_fn_decl(&mut self, d: &mut P<FnDecl>) {
124+
fn visit_fn_decl(&mut self, d: &mut FnDecl) {
125125
walk_fn_decl(self, d);
126126
}
127127

@@ -138,7 +138,7 @@ pub trait MutVisitor: Sized {
138138
walk_closure_binder(self, b);
139139
}
140140

141-
fn visit_block(&mut self, b: &mut P<Block>) {
141+
fn visit_block(&mut self, b: &mut Block) {
142142
walk_block(self, b);
143143
}
144144

@@ -184,7 +184,7 @@ pub trait MutVisitor: Sized {
184184
walk_ty(self, t);
185185
}
186186

187-
fn visit_ty_pat(&mut self, t: &mut P<TyPat>) {
187+
fn visit_ty_pat(&mut self, t: &mut TyPat) {
188188
walk_ty_pat(self, t);
189189
}
190190

@@ -240,7 +240,7 @@ pub trait MutVisitor: Sized {
240240
walk_parenthesized_parameter_data(self, p);
241241
}
242242

243-
fn visit_local(&mut self, l: &mut P<Local>) {
243+
fn visit_local(&mut self, l: &mut Local) {
244244
walk_local(self, l);
245245
}
246246

@@ -507,8 +507,8 @@ fn walk_assoc_item_constraint<T: MutVisitor>(
507507
vis.visit_span(span);
508508
}
509509

510-
pub fn walk_ty<T: MutVisitor>(vis: &mut T, ty: &mut P<Ty>) {
511-
let Ty { id, kind, span, tokens: _ } = ty.deref_mut();
510+
pub fn walk_ty<T: MutVisitor>(vis: &mut T, ty: &mut Ty) {
511+
let Ty { id, kind, span, tokens: _ } = ty;
512512
vis.visit_id(id);
513513
match kind {
514514
TyKind::Err(_guar) => {}
@@ -559,8 +559,8 @@ pub fn walk_ty<T: MutVisitor>(vis: &mut T, ty: &mut P<Ty>) {
559559
vis.visit_span(span);
560560
}
561561

562-
pub fn walk_ty_pat<T: MutVisitor>(vis: &mut T, ty: &mut P<TyPat>) {
563-
let TyPat { id, kind, span, tokens: _ } = ty.deref_mut();
562+
pub fn walk_ty_pat<T: MutVisitor>(vis: &mut T, ty: &mut TyPat) {
563+
let TyPat { id, kind, span, tokens: _ } = ty;
564564
vis.visit_id(id);
565565
match kind {
566566
TyPatKind::Range(start, end, _include_end) => {
@@ -651,8 +651,8 @@ fn walk_parenthesized_parameter_data<T: MutVisitor>(vis: &mut T, args: &mut Pare
651651
vis.visit_span(inputs_span);
652652
}
653653

654-
fn walk_local<T: MutVisitor>(vis: &mut T, local: &mut P<Local>) {
655-
let Local { id, super_, pat, ty, kind, span, colon_sp, attrs, tokens: _ } = local.deref_mut();
654+
fn walk_local<T: MutVisitor>(vis: &mut T, local: &mut Local) {
655+
let Local { id, super_, pat, ty, kind, span, colon_sp, attrs, tokens: _ } = local;
656656
visit_opt(super_, |sp| vis.visit_span(sp));
657657
vis.visit_id(id);
658658
visit_attrs(vis, attrs);
@@ -789,8 +789,8 @@ fn walk_fn<T: MutVisitor>(vis: &mut T, kind: FnKind<'_>) {
789789
}
790790
}
791791

792-
fn walk_contract<T: MutVisitor>(vis: &mut T, contract: &mut P<FnContract>) {
793-
let FnContract { requires, ensures } = contract.deref_mut();
792+
fn walk_contract<T: MutVisitor>(vis: &mut T, contract: &mut FnContract) {
793+
let FnContract { requires, ensures } = contract;
794794
if let Some(pred) = requires {
795795
vis.visit_expr(pred);
796796
}
@@ -799,8 +799,8 @@ fn walk_contract<T: MutVisitor>(vis: &mut T, contract: &mut P<FnContract>) {
799799
}
800800
}
801801

802-
fn walk_fn_decl<T: MutVisitor>(vis: &mut T, decl: &mut P<FnDecl>) {
803-
let FnDecl { inputs, output } = decl.deref_mut();
802+
fn walk_fn_decl<T: MutVisitor>(vis: &mut T, decl: &mut FnDecl) {
803+
let FnDecl { inputs, output } = decl;
804804
inputs.flat_map_in_place(|param| vis.flat_map_param(param));
805805
vis.visit_fn_ret_ty(output);
806806
}
@@ -999,8 +999,8 @@ pub fn walk_flat_map_expr_field<T: MutVisitor>(
999999
smallvec![f]
10001000
}
10011001

1002-
pub fn walk_block<T: MutVisitor>(vis: &mut T, block: &mut P<Block>) {
1003-
let Block { id, stmts, rules: _, span, tokens: _ } = block.deref_mut();
1002+
pub fn walk_block<T: MutVisitor>(vis: &mut T, block: &mut Block) {
1003+
let Block { id, stmts, rules: _, span, tokens: _ } = block;
10041004
vis.visit_id(id);
10051005
stmts.flat_map_in_place(|stmt| vis.flat_map_stmt(stmt));
10061006
vis.visit_span(span);
@@ -1049,8 +1049,8 @@ pub fn walk_flat_map_assoc_item(
10491049
smallvec![item]
10501050
}
10511051

1052-
pub fn walk_pat<T: MutVisitor>(vis: &mut T, pat: &mut P<Pat>) {
1053-
let Pat { id, kind, span, tokens: _ } = pat.deref_mut();
1052+
pub fn walk_pat<T: MutVisitor>(vis: &mut T, pat: &mut Pat) {
1053+
let Pat { id, kind, span, tokens: _ } = pat;
10541054
vis.visit_id(id);
10551055
match kind {
10561056
PatKind::Err(_guar) => {}

0 commit comments

Comments
 (0)
Please sign in to comment.