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 45f256d

Browse files
committedMay 27, 2025·
Auto merge of #141662 - matthiaskrgr:rollup-9kt4zj7, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #141312 (Add From<TryLockError> for io::Error) - #141495 (Rename `{GenericArg,Term}::unpack()` to `kind()`) - #141602 (triagebot: label LLVM submodule changes with `A-LLVM`) - #141632 (remove `visit_mt` from `ast::mut_visit`) - #141640 (test: convert version_check ui test to run-make) - #141645 (bump fluent-* crates) - #141650 (coverage: Revert "unused local file IDs" due to empty function names) - #141654 (tests: mark option-niche-eq as fixed on LLVM 21) Failed merges: - #141430 (remove `visit_clobber` and move `DummyAstNode` to `rustc_expand`) - #141636 (avoid some usages of `&mut P<T>` in AST visitors) r? `@ghost` `@rustbot` modify labels: rollup
2 parents c583fa6 + c7d0a61 commit 45f256d

File tree

112 files changed

+336
-413
lines changed

Some content is hidden

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

112 files changed

+336
-413
lines changed
 

‎Cargo.lock

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,16 +1259,16 @@ dependencies = [
12591259

12601260
[[package]]
12611261
name = "fluent-bundle"
1262-
version = "0.15.3"
1262+
version = "0.16.0"
12631263
source = "registry+https://github.com/rust-lang/crates.io-index"
1264-
checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493"
1264+
checksum = "01203cb8918f5711e73891b347816d932046f95f54207710bda99beaeb423bf4"
12651265
dependencies = [
12661266
"fluent-langneg",
12671267
"fluent-syntax",
12681268
"intl-memoizer",
12691269
"intl_pluralrules",
1270-
"rustc-hash 1.1.0",
1271-
"self_cell 0.10.3",
1270+
"rustc-hash 2.1.1",
1271+
"self_cell",
12721272
"smallvec",
12731273
"unic-langid",
12741274
]
@@ -1284,11 +1284,12 @@ dependencies = [
12841284

12851285
[[package]]
12861286
name = "fluent-syntax"
1287-
version = "0.11.1"
1287+
version = "0.12.0"
12881288
source = "registry+https://github.com/rust-lang/crates.io-index"
1289-
checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d"
1289+
checksum = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198"
12901290
dependencies = [
1291-
"thiserror 1.0.69",
1291+
"memchr",
1292+
"thiserror 2.0.12",
12921293
]
12931294

12941295
[[package]]
@@ -1934,9 +1935,9 @@ dependencies = [
19341935

19351936
[[package]]
19361937
name = "intl-memoizer"
1937-
version = "0.5.2"
1938+
version = "0.5.3"
19381939
source = "registry+https://github.com/rust-lang/crates.io-index"
1939-
checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda"
1940+
checksum = "310da2e345f5eb861e7a07ee182262e94975051db9e4223e909ba90f392f163f"
19401941
dependencies = [
19411942
"type-map",
19421943
"unic-langid",
@@ -4832,15 +4833,6 @@ version = "1.2.0"
48324833
source = "registry+https://github.com/rust-lang/crates.io-index"
48334834
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
48344835

4835-
[[package]]
4836-
name = "self_cell"
4837-
version = "0.10.3"
4838-
source = "registry+https://github.com/rust-lang/crates.io-index"
4839-
checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d"
4840-
dependencies = [
4841-
"self_cell 1.2.0",
4842-
]
4843-
48444836
[[package]]
48454837
name = "self_cell"
48464838
version = "1.2.0"

‎compiler/rustc_ast/src/mut_visit.rs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,6 @@ pub trait MutVisitor: Sized {
300300
walk_precise_capturing_arg(self, arg);
301301
}
302302

303-
fn visit_mt(&mut self, mt: &mut MutTy) {
304-
walk_mt(self, mt);
305-
}
306-
307303
fn visit_expr_field(&mut self, f: &mut ExprField) {
308304
walk_expr_field(self, f);
309305
}
@@ -519,10 +515,10 @@ pub fn walk_ty<T: MutVisitor>(vis: &mut T, ty: &mut P<Ty>) {
519515
TyKind::Infer | TyKind::ImplicitSelf | TyKind::Dummy | TyKind::Never | TyKind::CVarArgs => {
520516
}
521517
TyKind::Slice(ty) => vis.visit_ty(ty),
522-
TyKind::Ptr(mt) => vis.visit_mt(mt),
523-
TyKind::Ref(lt, mt) | TyKind::PinnedRef(lt, mt) => {
518+
TyKind::Ptr(MutTy { ty, mutbl: _ }) => vis.visit_ty(ty),
519+
TyKind::Ref(lt, MutTy { ty, mutbl: _ }) | TyKind::PinnedRef(lt, MutTy { ty, mutbl: _ }) => {
524520
visit_opt(lt, |lt| vis.visit_lifetime(lt));
525-
vis.visit_mt(mt);
521+
vis.visit_ty(ty);
526522
}
527523
TyKind::BareFn(bft) => {
528524
let BareFnTy { safety, ext: _, generic_params, decl, decl_span } = bft.deref_mut();
@@ -1003,10 +999,6 @@ pub fn walk_flat_map_expr_field<T: MutVisitor>(
1003999
smallvec![f]
10041000
}
10051001

1006-
fn walk_mt<T: MutVisitor>(vis: &mut T, MutTy { ty, mutbl: _ }: &mut MutTy) {
1007-
vis.visit_ty(ty);
1008-
}
1009-
10101002
pub fn walk_block<T: MutVisitor>(vis: &mut T, block: &mut P<Block>) {
10111003
let Block { id, stmts, rules: _, span, tokens: _ } = block.deref_mut();
10121004
vis.visit_id(id);

0 commit comments

Comments
 (0)
Please sign in to comment.