Skip to content

Commit 4f24cc6

Browse files
ShoyuVanillaShoyuVanilla
authored
Merge pull request rust-lang#20691 from lnicola/bump-rustc-again
minor: Bump rustc crates again
2 parents 42466b5 + c6b4f6f commit 4f24cc6

File tree

11 files changed

+50
-57
lines changed

11 files changed

+50
-57
lines changed

‎src/tools/rust-analyzer/Cargo.lock‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,9 +1863,9 @@ dependencies = [
18631863

18641864
[[package]]
18651865
name = "ra-ap-rustc_abi"
1866-
version = "0.129.0"
1866+
version = "0.130.0"
18671867
source = "registry+https://github.com/rust-lang/crates.io-index"
1868-
checksum = "aa338fe027a8915009ca4a5a1cb7dde5fb4bc4170a928cb9462fda9d2ec52cec"
1868+
checksum = "dd3df655461690c1554bc0e355f19495eef6cd729dc29f01bd07cb7cd2a0990a"
18691869
dependencies = [
18701870
"bitflags 2.9.1",
18711871
"ra-ap-rustc_hashes",
@@ -1875,34 +1875,34 @@ dependencies = [
18751875

18761876
[[package]]
18771877
name = "ra-ap-rustc_ast_ir"
1878-
version = "0.129.0"
1878+
version = "0.130.0"
18791879
source = "registry+https://github.com/rust-lang/crates.io-index"
1880-
checksum = "a8468ef77e5359b3a51e327406f29ca2283a4feef93d3ba04f6740b274636922"
1880+
checksum = "10f55c57676d67dba036171d23f7941a9c3b884181c5e93d3bd5fa599f8f129b"
18811881

18821882
[[package]]
18831883
name = "ra-ap-rustc_hashes"
1884-
version = "0.129.0"
1884+
version = "0.130.0"
18851885
source = "registry+https://github.com/rust-lang/crates.io-index"
1886-
checksum = "300bc3264ccc1e7a5b3f065023a02e612774206d8ad685b3b05c2e4e317f8daa"
1886+
checksum = "feec9ffe50d93b8f17770b49d4cbf46280e074a105c7c9325c8d2171cf395b76"
18871887
dependencies = [
18881888
"rustc-stable-hash",
18891889
]
18901890

18911891
[[package]]
18921892
name = "ra-ap-rustc_index"
1893-
version = "0.129.0"
1893+
version = "0.130.0"
18941894
source = "registry+https://github.com/rust-lang/crates.io-index"
1895-
checksum = "5eaa4a3ff61302e45c17ee72e067a39179081c19a12aa03192975a095f5d4e4b"
1895+
checksum = "a73bab902bcdeceac4a9630ed732d19f6b7189cbe8e828a94156a780bd8e1196"
18961896
dependencies = [
18971897
"ra-ap-rustc_index_macros",
18981898
"smallvec",
18991899
]
19001900

19011901
[[package]]
19021902
name = "ra-ap-rustc_index_macros"
1903-
version = "0.129.0"
1903+
version = "0.130.0"
19041904
source = "registry+https://github.com/rust-lang/crates.io-index"
1905-
checksum = "0f7af0d51ee6bd5280be8e2eb7e9ac5cd9fc87af7a99f50cdb1316a8779c15ab"
1905+
checksum = "88c7906b654b9c4188aee3fde82a7449bac6e156a5d86ad923bae05bd5040690"
19061906
dependencies = [
19071907
"proc-macro2",
19081908
"quote",
@@ -1911,9 +1911,9 @@ dependencies = [
19111911

19121912
[[package]]
19131913
name = "ra-ap-rustc_lexer"
1914-
version = "0.129.0"
1914+
version = "0.130.0"
19151915
source = "registry+https://github.com/rust-lang/crates.io-index"
1916-
checksum = "ee4e7df9bf702c855de7bea5e3c14b96f0728d4712edb663b0f4b183622341fc"
1916+
checksum = "acec3893f60dca2a37f9e838c08f3f3c8e012ce36194c2b84da96781e794e359"
19171917
dependencies = [
19181918
"memchr",
19191919
"unicode-properties",
@@ -1922,9 +1922,9 @@ dependencies = [
19221922

19231923
[[package]]
19241924
name = "ra-ap-rustc_next_trait_solver"
1925-
version = "0.129.0"
1925+
version = "0.130.0"
19261926
source = "registry+https://github.com/rust-lang/crates.io-index"
1927-
checksum = "15768080a276088a4a6af1e08a4ca622c57d5b4845ce5329dbbd71a2e025eecb"
1927+
checksum = "c4626e22dc21062bdac1a8340b497365e1983a69cc271d7d052a62348b88bd7f"
19281928
dependencies = [
19291929
"derive-where",
19301930
"ra-ap-rustc_index",
@@ -1935,19 +1935,19 @@ dependencies = [
19351935

19361936
[[package]]
19371937
name = "ra-ap-rustc_parse_format"
1938-
version = "0.129.0"
1938+
version = "0.130.0"
19391939
source = "registry+https://github.com/rust-lang/crates.io-index"
1940-
checksum = "e6f0c54b200c47768eaf142b1c829da9be1a3331a5defa4ac60bad4996f474e9"
1940+
checksum = "47a95720d31edf45a8ccde190c14954425af0d53c9b6d4702fdd905b3951a2e1"
19411941
dependencies = [
19421942
"ra-ap-rustc_lexer",
19431943
"rustc-literal-escaper 0.0.5",
19441944
]
19451945

19461946
[[package]]
19471947
name = "ra-ap-rustc_pattern_analysis"
1948-
version = "0.129.0"
1948+
version = "0.130.0"
19491949
source = "registry+https://github.com/rust-lang/crates.io-index"
1950-
checksum = "a078fbbefda17d8d5d2c9d6b5a1f9ee1e23fae5f057e74784f6b95c189b0b048"
1950+
checksum = "0c1ebf6272bf11f0ba3b909e3405f547de32ea19d745b8fef11f1fb643b72fcd"
19511951
dependencies = [
19521952
"ra-ap-rustc_index",
19531953
"rustc-hash 2.1.1",
@@ -1958,9 +1958,9 @@ dependencies = [
19581958

19591959
[[package]]
19601960
name = "ra-ap-rustc_type_ir"
1961-
version = "0.129.0"
1961+
version = "0.130.0"
19621962
source = "registry+https://github.com/rust-lang/crates.io-index"
1963-
checksum = "644e980122cdb7f2d7e175f33224dc6df414e8cf3e5dfbba9047e63336d9737a"
1963+
checksum = "a9aa8f1344940e097514403c53bb5a1e4f5c3986da888461bc651373d195090b"
19641964
dependencies = [
19651965
"arrayvec",
19661966
"bitflags 2.9.1",
@@ -1978,9 +1978,9 @@ dependencies = [
19781978

19791979
[[package]]
19801980
name = "ra-ap-rustc_type_ir_macros"
1981-
version = "0.129.0"
1981+
version = "0.130.0"
19821982
source = "registry+https://github.com/rust-lang/crates.io-index"
1983-
checksum = "827d242d444cea86d9a64b5ce99db1462c9d43c7c6226d44ec2bc621b7c253c0"
1983+
checksum = "30c65f1a5da2f3c39d72a56687694568abb203b3737a2321090e112da04958b3"
19841984
dependencies = [
19851985
"proc-macro2",
19861986
"quote",

‎src/tools/rust-analyzer/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
8989
vfs = { path = "./crates/vfs", version = "0.0.0" }
9090
edition = { path = "./crates/edition", version = "0.0.0" }
9191

92-
ra-ap-rustc_lexer = { version = "0.129", default-features = false }
93-
ra-ap-rustc_parse_format = { version = "0.129", default-features = false }
94-
ra-ap-rustc_index = { version = "0.129", default-features = false }
95-
ra-ap-rustc_abi = { version = "0.129", default-features = false }
96-
ra-ap-rustc_pattern_analysis = { version = "0.129", default-features = false }
97-
ra-ap-rustc_ast_ir = { version = "0.129", default-features = false }
98-
ra-ap-rustc_type_ir = { version = "0.129", default-features = false }
99-
ra-ap-rustc_next_trait_solver = { version = "0.129", default-features = false }
92+
ra-ap-rustc_lexer = { version = "0.130", default-features = false }
93+
ra-ap-rustc_parse_format = { version = "0.130", default-features = false }
94+
ra-ap-rustc_index = { version = "0.130", default-features = false }
95+
ra-ap-rustc_abi = { version = "0.130", default-features = false }
96+
ra-ap-rustc_pattern_analysis = { version = "0.130", default-features = false }
97+
ra-ap-rustc_ast_ir = { version = "0.130", default-features = false }
98+
ra-ap-rustc_type_ir = { version = "0.130", default-features = false }
99+
ra-ap-rustc_next_trait_solver = { version = "0.130", default-features = false }
100100

101101
# local crates that aren't published to crates.io. These should not have versions.
102102

‎src/tools/rust-analyzer/crates/hir-ty/src/display.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ fn render_const_scalar_inner(
897897
}
898898
f.write_str("]")
899899
}
900-
TyKind::Dynamic(_, _, _) => {
900+
TyKind::Dynamic(_, _) => {
901901
let addr = usize::from_le_bytes(b[0..b.len() / 2].try_into().unwrap());
902902
let ty_id = usize::from_le_bytes(b[b.len() / 2..].try_into().unwrap());
903903
let Ok(t) = memory_map.vtable_ty(ty_id) else {
@@ -1064,7 +1064,7 @@ fn render_const_scalar_inner(
10641064
| TyKind::Bound(_, _)
10651065
| TyKind::Infer(_) => f.write_str("<placeholder-or-unknown-type>"),
10661066
// The below arms are unreachable, since we handled them in ref case.
1067-
TyKind::Slice(_) | TyKind::Str | TyKind::Dynamic(_, _, _) => f.write_str("<unsized-value>"),
1067+
TyKind::Slice(_) | TyKind::Str | TyKind::Dynamic(_, _) => f.write_str("<unsized-value>"),
10681068
}
10691069
}
10701070

@@ -1213,7 +1213,7 @@ impl<'db> HirDisplay for crate::next_solver::Ty<'db> {
12131213
})
12141214
};
12151215
let (preds_to_print, has_impl_fn_pred) = match t.kind() {
1216-
TyKind::Dynamic(bounds, region, _) => {
1216+
TyKind::Dynamic(bounds, region) => {
12171217
let render_lifetime = f.render_region(region);
12181218
(
12191219
bounds.len() + render_lifetime as usize,

‎src/tools/rust-analyzer/crates/hir-ty/src/infer/coerce.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ impl<'a, 'b, 'db> Coerce<'a, 'b, 'db> {
611611
| TyKind::Slice(_)
612612
| TyKind::FnDef(_, _)
613613
| TyKind::FnPtr(_, _)
614-
| TyKind::Dynamic(_, _, _)
614+
| TyKind::Dynamic(_, _)
615615
| TyKind::Closure(_, _)
616616
| TyKind::CoroutineClosure(_, _)
617617
| TyKind::Coroutine(_, _)

‎src/tools/rust-analyzer/crates/hir-ty/src/lower_nextsolver.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ impl<'db, 'a> TyLoweringContext<'db, 'a> {
790790
},
791791
None => Region::new_static(self.interner),
792792
};
793-
Ty::new_dynamic(self.interner, bounds, region, rustc_type_ir::DynKind::Dyn)
793+
Ty::new_dynamic(self.interner, bounds, region)
794794
} else {
795795
// FIXME: report error
796796
// (additional non-auto traits, associated type rebound, or no resolved trait)

‎src/tools/rust-analyzer/crates/hir-ty/src/method_resolution.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ impl TyFingerprint {
164164
rustc_ast_ir::Mutability::Not => TyFingerprint::RawPtr(Mutability::Not),
165165
},
166166
TyKind::Foreign(def) => TyFingerprint::ForeignType(crate::to_foreign_def_id(def.0)),
167-
TyKind::Dynamic(bounds, _, _) => {
167+
TyKind::Dynamic(bounds, _) => {
168168
let trait_ref = bounds
169169
.as_slice()
170170
.iter()

‎src/tools/rust-analyzer/crates/hir-ty/src/mir/eval.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2446,7 +2446,7 @@ impl<'db> Evaluator<'db> {
24462446
| TyKind::Foreign(_)
24472447
| TyKind::Error(_)
24482448
| TyKind::Placeholder(_)
2449-
| TyKind::Dynamic(_, _, _)
2449+
| TyKind::Dynamic(_, _)
24502450
| TyKind::Alias(_, _)
24512451
| TyKind::Bound(_, _)
24522452
| TyKind::Infer(_)

‎src/tools/rust-analyzer/crates/hir-ty/src/next_solver/fulfill/errors.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,7 @@ mod wf {
11461146
}
11471147
TyKind::UnsafeBinder(ty) => {}
11481148

1149-
TyKind::Dynamic(data, r, _) => {
1149+
TyKind::Dynamic(data, r) => {
11501150
// WfObject
11511151
//
11521152
// Here, we defer WF checking due to higher-ranked

‎src/tools/rust-analyzer/crates/hir-ty/src/next_solver/mapping.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,7 @@ impl<'db> ChalkToNextSolver<'db, Ty<'db>> for chalk_ir::Ty<Interner> {
370370
}),
371371
);
372372
let region = dyn_ty.lifetime.to_nextsolver(interner);
373-
let kind = rustc_type_ir::DynKind::Dyn;
374-
rustc_type_ir::TyKind::Dynamic(bounds, region, kind)
373+
rustc_type_ir::TyKind::Dynamic(bounds, region)
375374
}
376375
chalk_ir::TyKind::Alias(alias_ty) => match alias_ty {
377376
chalk_ir::AliasTy::Projection(projection_ty) => {
@@ -1445,8 +1444,7 @@ pub(crate) fn convert_ty_for_result<'db>(interner: DbInterner<'db>, ty: Ty<'db>)
14451444
TyKind::Function(fnptr)
14461445
}
14471446

1448-
rustc_type_ir::TyKind::Dynamic(preds, region, dyn_kind) => {
1449-
assert!(matches!(dyn_kind, rustc_type_ir::DynKind::Dyn));
1447+
rustc_type_ir::TyKind::Dynamic(preds, region) => {
14501448
let self_ty = Ty::new_bound(
14511449
interner,
14521450
DebruijnIndex::from_u32(1),

‎src/tools/rust-analyzer/crates/hir-ty/src/next_solver/ty.rs‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ impl<'db> Ty<'db> {
178178
| TyKind::Never
179179
| TyKind::Error(_) => true,
180180

181-
TyKind::Str | TyKind::Slice(_) | TyKind::Dynamic(_, _, _) => match sizedness {
181+
TyKind::Str | TyKind::Slice(_) | TyKind::Dynamic(_, _) => match sizedness {
182182
SizedTraitKind::Sized => false,
183183
SizedTraitKind::MetaSized => true,
184184
},
@@ -421,7 +421,7 @@ impl<'db> TypeSuperVisitable<DbInterner<'db>> for Ty<'db> {
421421
}
422422
TyKind::Slice(typ) => typ.visit_with(visitor),
423423
TyKind::Adt(_, args) => args.visit_with(visitor),
424-
TyKind::Dynamic(ref trait_ty, ref reg, _) => {
424+
TyKind::Dynamic(ref trait_ty, ref reg) => {
425425
try_visit!(trait_ty.visit_with(visitor));
426426
reg.visit_with(visitor)
427427
}
@@ -486,11 +486,9 @@ impl<'db> TypeSuperFoldable<DbInterner<'db>> for Ty<'db> {
486486
}
487487
TyKind::Slice(typ) => TyKind::Slice(typ.try_fold_with(folder)?),
488488
TyKind::Adt(tid, args) => TyKind::Adt(tid, args.try_fold_with(folder)?),
489-
TyKind::Dynamic(trait_ty, region, representation) => TyKind::Dynamic(
490-
trait_ty.try_fold_with(folder)?,
491-
region.try_fold_with(folder)?,
492-
representation,
493-
),
489+
TyKind::Dynamic(trait_ty, region) => {
490+
TyKind::Dynamic(trait_ty.try_fold_with(folder)?, region.try_fold_with(folder)?)
491+
}
494492
TyKind::Tuple(ts) => TyKind::Tuple(ts.try_fold_with(folder)?),
495493
TyKind::FnDef(def_id, args) => TyKind::FnDef(def_id, args.try_fold_with(folder)?),
496494
TyKind::FnPtr(sig_tys, hdr) => TyKind::FnPtr(sig_tys.try_fold_with(folder)?, hdr),
@@ -537,11 +535,9 @@ impl<'db> TypeSuperFoldable<DbInterner<'db>> for Ty<'db> {
537535
TyKind::Array(typ, sz) => TyKind::Array(typ.fold_with(folder), sz.fold_with(folder)),
538536
TyKind::Slice(typ) => TyKind::Slice(typ.fold_with(folder)),
539537
TyKind::Adt(tid, args) => TyKind::Adt(tid, args.fold_with(folder)),
540-
TyKind::Dynamic(trait_ty, region, representation) => TyKind::Dynamic(
541-
trait_ty.fold_with(folder),
542-
region.fold_with(folder),
543-
representation,
544-
),
538+
TyKind::Dynamic(trait_ty, region) => {
539+
TyKind::Dynamic(trait_ty.fold_with(folder), region.fold_with(folder))
540+
}
545541
TyKind::Tuple(ts) => TyKind::Tuple(ts.fold_with(folder)),
546542
TyKind::FnDef(def_id, args) => TyKind::FnDef(def_id, args.fold_with(folder)),
547543
TyKind::FnPtr(sig_tys, hdr) => TyKind::FnPtr(sig_tys.fold_with(folder), hdr),
@@ -676,9 +672,8 @@ impl<'db> rustc_type_ir::inherent::Ty<DbInterner<'db>> for Ty<'db> {
676672
interner: DbInterner<'db>,
677673
preds: <DbInterner<'db> as rustc_type_ir::Interner>::BoundExistentialPredicates,
678674
region: <DbInterner<'db> as rustc_type_ir::Interner>::Region,
679-
kind: rustc_type_ir::DynKind,
680675
) -> Self {
681-
Ty::new(interner, TyKind::Dynamic(preds, region, kind))
676+
Ty::new(interner, TyKind::Dynamic(preds, region))
682677
}
683678

684679
fn new_coroutine(

0 commit comments

Comments
 (0)