Skip to content

Commit 9348de0

Browse files
lnicolalnicola
authored
Merge pull request rust-lang#20694 from ShoyuVanilla/bump-rustc
minor: Yet another rustc crates bump
2 parents ddbfd3a + 3ba8b8e commit 9348de0

File tree

9 files changed

+62
-49
lines changed

9 files changed

+62
-49
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.130.0"
1866+
version = "0.131.0"
18671867
source = "registry+https://github.com/rust-lang/crates.io-index"
1868-
checksum = "dd3df655461690c1554bc0e355f19495eef6cd729dc29f01bd07cb7cd2a0990a"
1868+
checksum = "016c05852e89655395fbf7d5e729e31cd58b2690480b3a8468eb2b38c91f3756"
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.130.0"
1878+
version = "0.131.0"
18791879
source = "registry+https://github.com/rust-lang/crates.io-index"
1880-
checksum = "10f55c57676d67dba036171d23f7941a9c3b884181c5e93d3bd5fa599f8f129b"
1880+
checksum = "c5bff48bd0a26f17a4e2e8610bc393296c3d002e221f5c6c4d2875e6a64a3b4b"
18811881

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

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

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

19121912
[[package]]
19131913
name = "ra-ap-rustc_lexer"
1914-
version = "0.130.0"
1914+
version = "0.131.0"
19151915
source = "registry+https://github.com/rust-lang/crates.io-index"
1916-
checksum = "acec3893f60dca2a37f9e838c08f3f3c8e012ce36194c2b84da96781e794e359"
1916+
checksum = "585c71ff7da5ca1e8a0c65d5e7cec7ab2a7e9e45b6859543bd2d0be21bee631c"
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.130.0"
1925+
version = "0.131.0"
19261926
source = "registry+https://github.com/rust-lang/crates.io-index"
1927-
checksum = "c4626e22dc21062bdac1a8340b497365e1983a69cc271d7d052a62348b88bd7f"
1927+
checksum = "839f521a6cd97c71b2b6681604ace38a9c6737f7a223d072fa8f909879f9dc4b"
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.130.0"
1938+
version = "0.131.0"
19391939
source = "registry+https://github.com/rust-lang/crates.io-index"
1940-
checksum = "47a95720d31edf45a8ccde190c14954425af0d53c9b6d4702fdd905b3951a2e1"
1940+
checksum = "83e7872a4fa0620937b60fc6270aa8c31864cb324357553e2be5b2bdc25fa89a"
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.130.0"
1948+
version = "0.131.0"
19491949
source = "registry+https://github.com/rust-lang/crates.io-index"
1950-
checksum = "0c1ebf6272bf11f0ba3b909e3405f547de32ea19d745b8fef11f1fb643b72fcd"
1950+
checksum = "4ecd7f9b960c8cf1e9d02a25297f52a520134132164cfedd3e69fee4f294d41c"
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.130.0"
1961+
version = "0.131.0"
19621962
source = "registry+https://github.com/rust-lang/crates.io-index"
1963-
checksum = "a9aa8f1344940e097514403c53bb5a1e4f5c3986da888461bc651373d195090b"
1963+
checksum = "9494498f8f7c57a5b4ea4e35a6c554cca8d5323adb534d13dc6cd117a7e00e4d"
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.130.0"
1981+
version = "0.131.0"
19821982
source = "registry+https://github.com/rust-lang/crates.io-index"
1983-
checksum = "30c65f1a5da2f3c39d72a56687694568abb203b3737a2321090e112da04958b3"
1983+
checksum = "28ed893760b86529080af59438c28dfa9ca976b821cfd0a3b0eb9591932847e6"
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.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 }
92+
ra-ap-rustc_lexer = { version = "0.131", default-features = false }
93+
ra-ap-rustc_parse_format = { version = "0.131", default-features = false }
94+
ra-ap-rustc_index = { version = "0.131", default-features = false }
95+
ra-ap-rustc_abi = { version = "0.131", default-features = false }
96+
ra-ap-rustc_pattern_analysis = { version = "0.131", default-features = false }
97+
ra-ap-rustc_ast_ir = { version = "0.131", default-features = false }
98+
ra-ap-rustc_type_ir = { version = "0.131", default-features = false }
99+
ra-ap-rustc_next_trait_solver = { version = "0.131", 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/infer/unify.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ impl<'db> InferenceTable<'db> {
910910
match result {
911911
Ok((_, Certainty::Yes)) => {}
912912
Err(rustc_type_ir::solve::NoSolution) => {}
913-
Ok((_, Certainty::Maybe(_))) => {
913+
Ok((_, Certainty::Maybe { .. })) => {
914914
self.fulfillment_cx.register_predicate_obligation(
915915
&self.infer_ctxt,
916916
Obligation::new(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl<'db> FulfillmentCtxt<'db> {
182182
if let Some(certainty) = delegate.compute_goal_fast_path(goal, Span::dummy()) {
183183
match certainty {
184184
Certainty::Yes => {}
185-
Certainty::Maybe(_) => {
185+
Certainty::Maybe { .. } => {
186186
self.obligations.register(obligation, None);
187187
}
188188
}
@@ -211,7 +211,7 @@ impl<'db> FulfillmentCtxt<'db> {
211211

212212
match certainty {
213213
Certainty::Yes => {}
214-
Certainty::Maybe(_) => self.obligations.register(obligation, stalled_on),
214+
Certainty::Maybe { .. } => self.obligations.register(obligation, stalled_on),
215215
}
216216
}
217217

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,17 @@ pub(super) fn fulfillment_error_for_stalled<'db>(
153153
Span::dummy(),
154154
None,
155155
) {
156-
Ok(GoalEvaluation { certainty: Certainty::Maybe(MaybeCause::Ambiguity), .. }) => {
157-
(FulfillmentErrorCode::Ambiguity { overflow: None }, true)
158-
}
156+
Ok(GoalEvaluation {
157+
certainty: Certainty::Maybe { cause: MaybeCause::Ambiguity, .. },
158+
..
159+
}) => (FulfillmentErrorCode::Ambiguity { overflow: None }, true),
159160
Ok(GoalEvaluation {
160161
certainty:
161-
Certainty::Maybe(MaybeCause::Overflow {
162-
suggest_increasing_limit,
163-
keep_constraints: _,
164-
}),
162+
Certainty::Maybe {
163+
cause:
164+
MaybeCause::Overflow { suggest_increasing_limit, keep_constraints: _ },
165+
..
166+
},
165167
..
166168
}) => (
167169
FulfillmentErrorCode::Ambiguity { overflow: Some(suggest_increasing_limit) },
@@ -314,7 +316,8 @@ impl<'db> BestObligation<'db> {
314316
.instantiate_proof_tree_for_nested_goal(GoalSource::Misc, obligation.as_goal());
315317
// Skip nested goals that aren't the *reason* for our goal's failure.
316318
match (self.consider_ambiguities, nested_goal.result()) {
317-
(true, Ok(Certainty::Maybe(MaybeCause::Ambiguity))) | (false, Err(_)) => {}
319+
(true, Ok(Certainty::Maybe { cause: MaybeCause::Ambiguity, .. }))
320+
| (false, Err(_)) => {}
318321
_ => continue,
319322
}
320323

@@ -456,7 +459,8 @@ impl<'db> ProofTreeVisitor<'db> for BestObligation<'db> {
456459
let interner = goal.infcx().interner;
457460
// Skip goals that aren't the *reason* for our goal's failure.
458461
match (self.consider_ambiguities, goal.result()) {
459-
(true, Ok(Certainty::Maybe(MaybeCause::Ambiguity))) | (false, Err(_)) => {}
462+
(true, Ok(Certainty::Maybe { cause: MaybeCause::Ambiguity, .. })) | (false, Err(_)) => {
463+
}
460464
_ => return ControlFlow::Continue(()),
461465
}
462466

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,4 +321,13 @@ impl<'db> rustc_type_ir::InferCtxtLike for InferCtxt<'db> {
321321
fn sub_unify_ty_vids_raw(&self, a: rustc_type_ir::TyVid, b: rustc_type_ir::TyVid) {
322322
self.sub_unify_ty_vids_raw(a, b);
323323
}
324+
325+
fn opaques_with_sub_unified_hidden_type(
326+
&self,
327+
_ty: TyVid,
328+
) -> Vec<rustc_type_ir::AliasTy<Self::Interner>> {
329+
// FIXME: I guess we are okay without this for now since currently r-a lacks of
330+
// detailed checks over opaque types. Might need to implement this in future.
331+
vec![]
332+
}
324333
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ impl<'db> ProofTreeVisitor<'db> for Select {
208208

209209
// Don't winnow until `Certainty::Yes` -- we don't need to winnow until
210210
// codegen, and only on the good path.
211-
if matches!(goal.result().unwrap(), Certainty::Maybe(..)) {
211+
if matches!(goal.result().unwrap(), Certainty::Maybe { .. }) {
212212
return ControlFlow::Break(Ok(None));
213213
}
214214

@@ -241,7 +241,7 @@ fn candidate_should_be_dropped_in_favor_of<'db>(
241241
) -> bool {
242242
// Don't winnow until `Certainty::Yes` -- we don't need to winnow until
243243
// codegen, and only on the good path.
244-
if matches!(other.result().unwrap(), Certainty::Maybe(..)) {
244+
if matches!(other.result().unwrap(), Certainty::Maybe { .. }) {
245245
return false;
246246
}
247247

@@ -284,13 +284,13 @@ fn candidate_should_be_dropped_in_favor_of<'db>(
284284
}
285285

286286
fn to_selection<'db>(cand: InspectCandidate<'_, 'db>) -> Option<Selection<'db>> {
287-
if let Certainty::Maybe(..) = cand.shallow_certainty() {
287+
if let Certainty::Maybe { .. } = cand.shallow_certainty() {
288288
return None;
289289
}
290290

291291
let nested = match cand.result().expect("expected positive result") {
292292
Certainty::Yes => Vec::new(),
293-
Certainty::Maybe(_) => cand
293+
Certainty::Maybe { .. } => cand
294294
.instantiate_nested_goals()
295295
.into_iter()
296296
.map(|nested| {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ impl<'a, 'db> InspectGoal<'a, 'db> {
350350
inspect::ProbeStep::MakeCanonicalResponse { shallow_certainty: c } => {
351351
assert!(matches!(
352352
shallow_certainty.replace(c),
353-
None | Some(Certainty::Maybe(MaybeCause::Ambiguity))
353+
None | Some(Certainty::Maybe { cause: MaybeCause::Ambiguity, .. })
354354
));
355355
}
356356
inspect::ProbeStep::NestedProbe(ref probe) => {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ pub fn next_trait_solve(
277277
Ok((_, Certainty::Yes, args)) => NextTraitSolveResult::Certain(
278278
convert_canonical_args_for_result(DbInterner::new_with(db, Some(krate), block), args),
279279
),
280-
Ok((_, Certainty::Maybe(_), args)) => {
280+
Ok((_, Certainty::Maybe { .. }, args)) => {
281281
let subst = convert_canonical_args_for_result(
282282
DbInterner::new_with(db, Some(krate), block),
283283
args,
@@ -316,7 +316,7 @@ pub fn next_trait_solve_canonical_in_ctxt<'db>(
316316
Ok((_, Certainty::Yes, args)) => NextTraitSolveResult::Certain(
317317
convert_canonical_args_for_result(infer_ctxt.interner, args),
318318
),
319-
Ok((_, Certainty::Maybe(_), args)) => {
319+
Ok((_, Certainty::Maybe { .. }, args)) => {
320320
let subst = convert_canonical_args_for_result(infer_ctxt.interner, args);
321321
NextTraitSolveResult::Uncertain(chalk_ir::Canonical {
322322
binders: subst.binders,

0 commit comments

Comments
 (0)