Skip to content

Commit 42466b5

Browse files
authored
Merge pull request rust-lang#20690 from ShoyuVanilla/update-rustc
minor: Update rustc deps
2 parents a520c46 + 7e270ab commit 42466b5

File tree

3 files changed

+44
-30
lines changed

3 files changed

+44
-30
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.128.0"
1866+
version = "0.129.0"
18671867
source = "registry+https://github.com/rust-lang/crates.io-index"
1868-
checksum = "8da95e732b424802b1f043ab4007c78a0fc515ab249587abbea4634bf5fdce9a"
1868+
checksum = "aa338fe027a8915009ca4a5a1cb7dde5fb4bc4170a928cb9462fda9d2ec52cec"
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.128.0"
1878+
version = "0.129.0"
18791879
source = "registry+https://github.com/rust-lang/crates.io-index"
1880-
checksum = "3838d9d7a3a5cdc511cfb6ad78740ce532f75a2366d3fc3b9853ea1b5c872779"
1880+
checksum = "a8468ef77e5359b3a51e327406f29ca2283a4feef93d3ba04f6740b274636922"
18811881

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

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

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

19121912
[[package]]
19131913
name = "ra-ap-rustc_lexer"
1914-
version = "0.128.0"
1914+
version = "0.129.0"
19151915
source = "registry+https://github.com/rust-lang/crates.io-index"
1916-
checksum = "f1c31a82f091b910a27ee53a86a9af28a2df10c3484e2f1bbfe70633aa84dee9"
1916+
checksum = "ee4e7df9bf702c855de7bea5e3c14b96f0728d4712edb663b0f4b183622341fc"
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.128.0"
1925+
version = "0.129.0"
19261926
source = "registry+https://github.com/rust-lang/crates.io-index"
1927-
checksum = "f8cac6c2b5a8924209d4ca682cbc507252c58a664911e0ef463c112882ba6f72"
1927+
checksum = "15768080a276088a4a6af1e08a4ca622c57d5b4845ce5329dbbd71a2e025eecb"
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.128.0"
1938+
version = "0.129.0"
19391939
source = "registry+https://github.com/rust-lang/crates.io-index"
1940-
checksum = "a085a1cf902dcca8abbc537faaef154bbccbbb51850f779ce5484ae3782b5d8f"
1940+
checksum = "e6f0c54b200c47768eaf142b1c829da9be1a3331a5defa4ac60bad4996f474e9"
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.128.0"
1948+
version = "0.129.0"
19491949
source = "registry+https://github.com/rust-lang/crates.io-index"
1950-
checksum = "8ba32e3985367bc34856b41c7604133649d4a367eb5d7bdf50623025731459d8"
1950+
checksum = "a078fbbefda17d8d5d2c9d6b5a1f9ee1e23fae5f057e74784f6b95c189b0b048"
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.128.0"
1961+
version = "0.129.0"
19621962
source = "registry+https://github.com/rust-lang/crates.io-index"
1963-
checksum = "9c9911d72f75d85d21fe88374d7bcec94f2200feffb7234108a24cc3da7c3591"
1963+
checksum = "644e980122cdb7f2d7e175f33224dc6df414e8cf3e5dfbba9047e63336d9737a"
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.128.0"
1981+
version = "0.129.0"
19821982
source = "registry+https://github.com/rust-lang/crates.io-index"
1983-
checksum = "22f539b87991683ce17cc52e62600fdf2b4a8af43952db30387edc1a576d3b43"
1983+
checksum = "827d242d444cea86d9a64b5ce99db1462c9d43c7c6226d44ec2bc621b7c253c0"
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.128", default-features = false }
93-
ra-ap-rustc_parse_format = { version = "0.128", default-features = false }
94-
ra-ap-rustc_index = { version = "0.128", default-features = false }
95-
ra-ap-rustc_abi = { version = "0.128", default-features = false }
96-
ra-ap-rustc_pattern_analysis = { version = "0.128", default-features = false }
97-
ra-ap-rustc_ast_ir = { version = "0.128", default-features = false }
98-
ra-ap-rustc_type_ir = { version = "0.128", default-features = false }
99-
ra-ap-rustc_next_trait_solver = { version = "0.128", default-features = false }
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 }
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/next_solver/interner.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,6 +1674,20 @@ impl<'db> rustc_type_ir::Interner for DbInterner<'db> {
16741674
}
16751675
}
16761676

1677+
fn for_each_blanket_impl(self, trait_def_id: Self::TraitId, mut f: impl FnMut(Self::ImplId)) {
1678+
let Some(krate) = self.krate else { return };
1679+
1680+
for impls in self.db.trait_impls_in_deps(krate).iter() {
1681+
for impl_id in impls.for_trait(trait_def_id.0) {
1682+
let impl_data = self.db.impl_signature(impl_id);
1683+
let self_ty_ref = &impl_data.store[impl_data.self_ty];
1684+
if matches!(self_ty_ref, hir_def::type_ref::TypeRef::TypeParam(_)) {
1685+
f(impl_id.into());
1686+
}
1687+
}
1688+
}
1689+
}
1690+
16771691
fn has_item_definition(self, def_id: Self::DefId) -> bool {
16781692
// FIXME(next-solver): should check if the associated item has a value.
16791693
true

0 commit comments

Comments
 (0)