Merge pull request #20694 from ShoyuVanilla/bump-rustc

minor: Yet another rustc crates bump

Author: lnicola

Cargo.lock

@@ -89,14 +89,14 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
 edition = { path = "./crates/edition", version = "0.0.0" }
 
-ra-ap-rustc_lexer = { version = "0.130", default-features = false }
-ra-ap-rustc_parse_format = { version = "0.130", default-features = false }
-ra-ap-rustc_index = { version = "0.130", default-features = false }
-ra-ap-rustc_abi = { version = "0.130", default-features = false }
-ra-ap-rustc_pattern_analysis = { version = "0.130", default-features = false }
-ra-ap-rustc_ast_ir = { version = "0.130", default-features = false }
-ra-ap-rustc_type_ir = { version = "0.130", default-features = false }
-ra-ap-rustc_next_trait_solver = { version = "0.130", default-features = false }
+ra-ap-rustc_lexer = { version = "0.131", default-features = false }
+ra-ap-rustc_parse_format = { version = "0.131", default-features = false }
+ra-ap-rustc_index = { version = "0.131", default-features = false }
+ra-ap-rustc_abi = { version = "0.131", default-features = false }
+ra-ap-rustc_pattern_analysis = { version = "0.131", default-features = false }
+ra-ap-rustc_ast_ir = { version = "0.131", default-features = false }
+ra-ap-rustc_type_ir = { version = "0.131", default-features = false }
+ra-ap-rustc_next_trait_solver = { version = "0.131", default-features = false }
 
 # local crates that aren't published to crates.io. These should not have versions.
 

Cargo.toml

@@ -910,7 +910,7 @@ impl<'db> InferenceTable<'db> {
         match result {
             Ok((_, Certainty::Yes)) => {}
             Err(rustc_type_ir::solve::NoSolution) => {}
-            Ok((_, Certainty::Maybe(_))) => {
+            Ok((_, Certainty::Maybe { .. })) => {
                 self.fulfillment_cx.register_predicate_obligation(
                     &self.infer_ctxt,
                     Obligation::new(

crates/hir-ty/src/infer/unify.rs

@@ -182,7 +182,7 @@ impl<'db> FulfillmentCtxt<'db> {
                 if let Some(certainty) = delegate.compute_goal_fast_path(goal, Span::dummy()) {
                     match certainty {
                         Certainty::Yes => {}
-                        Certainty::Maybe(_) => {
+                        Certainty::Maybe { .. } => {
                             self.obligations.register(obligation, None);
                         }
                     }
@@ -211,7 +211,7 @@ impl<'db> FulfillmentCtxt<'db> {
 
                 match certainty {
                     Certainty::Yes => {}
-                    Certainty::Maybe(_) => self.obligations.register(obligation, stalled_on),
+                    Certainty::Maybe { .. } => self.obligations.register(obligation, stalled_on),
                 }
             }
 

crates/hir-ty/src/next_solver/fulfill.rs

@@ -153,15 +153,17 @@ pub(super) fn fulfillment_error_for_stalled<'db>(
             Span::dummy(),
             None,
         ) {
-            Ok(GoalEvaluation { certainty: Certainty::Maybe(MaybeCause::Ambiguity), .. }) => {
-                (FulfillmentErrorCode::Ambiguity { overflow: None }, true)
-            }
+            Ok(GoalEvaluation {
+                certainty: Certainty::Maybe { cause: MaybeCause::Ambiguity, .. },
+                ..
+            }) => (FulfillmentErrorCode::Ambiguity { overflow: None }, true),
             Ok(GoalEvaluation {
                 certainty:
-                    Certainty::Maybe(MaybeCause::Overflow {
-                        suggest_increasing_limit,
-                        keep_constraints: _,
-                    }),
+                    Certainty::Maybe {
+                        cause:
+                            MaybeCause::Overflow { suggest_increasing_limit, keep_constraints: _ },
+                        ..
+                    },
                 ..
             }) => (
                 FulfillmentErrorCode::Ambiguity { overflow: Some(suggest_increasing_limit) },
@@ -314,7 +316,8 @@ impl<'db> BestObligation<'db> {
                 .instantiate_proof_tree_for_nested_goal(GoalSource::Misc, obligation.as_goal());
             // Skip nested goals that aren't the *reason* for our goal's failure.
             match (self.consider_ambiguities, nested_goal.result()) {
-                (true, Ok(Certainty::Maybe(MaybeCause::Ambiguity))) | (false, Err(_)) => {}
+                (true, Ok(Certainty::Maybe { cause: MaybeCause::Ambiguity, .. }))
+                | (false, Err(_)) => {}
                 _ => continue,
             }
 
@@ -456,7 +459,8 @@ impl<'db> ProofTreeVisitor<'db> for BestObligation<'db> {
         let interner = goal.infcx().interner;
         // Skip goals that aren't the *reason* for our goal's failure.
         match (self.consider_ambiguities, goal.result()) {
-            (true, Ok(Certainty::Maybe(MaybeCause::Ambiguity))) | (false, Err(_)) => {}
+            (true, Ok(Certainty::Maybe { cause: MaybeCause::Ambiguity, .. })) | (false, Err(_)) => {
+            }
             _ => return ControlFlow::Continue(()),
         }
 

crates/hir-ty/src/next_solver/fulfill/errors.rs

@@ -321,4 +321,13 @@ impl<'db> rustc_type_ir::InferCtxtLike for InferCtxt<'db> {
     fn sub_unify_ty_vids_raw(&self, a: rustc_type_ir::TyVid, b: rustc_type_ir::TyVid) {
         self.sub_unify_ty_vids_raw(a, b);
     }
+
+    fn opaques_with_sub_unified_hidden_type(
+        &self,
+        _ty: TyVid,
+    ) -> Vec<rustc_type_ir::AliasTy<Self::Interner>> {
+        // FIXME: I guess we are okay without this for now since currently r-a lacks of
+        // detailed checks over opaque types. Might need to implement this in future.
+        vec![]
+    }
 }

crates/hir-ty/src/next_solver/infer/context.rs

@@ -208,7 +208,7 @@ impl<'db> ProofTreeVisitor<'db> for Select {
 
         // Don't winnow until `Certainty::Yes` -- we don't need to winnow until
         // codegen, and only on the good path.
-        if matches!(goal.result().unwrap(), Certainty::Maybe(..)) {
+        if matches!(goal.result().unwrap(), Certainty::Maybe { .. }) {
             return ControlFlow::Break(Ok(None));
         }
 
@@ -241,7 +241,7 @@ fn candidate_should_be_dropped_in_favor_of<'db>(
 ) -> bool {
     // Don't winnow until `Certainty::Yes` -- we don't need to winnow until
     // codegen, and only on the good path.
-    if matches!(other.result().unwrap(), Certainty::Maybe(..)) {
+    if matches!(other.result().unwrap(), Certainty::Maybe { .. }) {
         return false;
     }
 
@@ -284,13 +284,13 @@ fn candidate_should_be_dropped_in_favor_of<'db>(
 }
 
 fn to_selection<'db>(cand: InspectCandidate<'_, 'db>) -> Option<Selection<'db>> {
-    if let Certainty::Maybe(..) = cand.shallow_certainty() {
+    if let Certainty::Maybe { .. } = cand.shallow_certainty() {
         return None;
     }
 
     let nested = match cand.result().expect("expected positive result") {
         Certainty::Yes => Vec::new(),
-        Certainty::Maybe(_) => cand
+        Certainty::Maybe { .. } => cand
             .instantiate_nested_goals()
             .into_iter()
             .map(|nested| {

crates/hir-ty/src/next_solver/infer/select.rs

@@ -350,7 +350,7 @@ impl<'a, 'db> InspectGoal<'a, 'db> {
                 inspect::ProbeStep::MakeCanonicalResponse { shallow_certainty: c } => {
                     assert!(matches!(
                         shallow_certainty.replace(c),
-                        None | Some(Certainty::Maybe(MaybeCause::Ambiguity))
+                        None | Some(Certainty::Maybe { cause: MaybeCause::Ambiguity, .. })
                     ));
                 }
                 inspect::ProbeStep::NestedProbe(ref probe) => {

crates/hir-ty/src/next_solver/inspect.rs

@@ -277,7 +277,7 @@ pub fn next_trait_solve(
         Ok((_, Certainty::Yes, args)) => NextTraitSolveResult::Certain(
             convert_canonical_args_for_result(DbInterner::new_with(db, Some(krate), block), args),
         ),
-        Ok((_, Certainty::Maybe(_), args)) => {
+        Ok((_, Certainty::Maybe { .. }, args)) => {
             let subst = convert_canonical_args_for_result(
                 DbInterner::new_with(db, Some(krate), block),
                 args,
@@ -316,7 +316,7 @@ pub fn next_trait_solve_canonical_in_ctxt<'db>(
         Ok((_, Certainty::Yes, args)) => NextTraitSolveResult::Certain(
             convert_canonical_args_for_result(infer_ctxt.interner, args),
         ),
-        Ok((_, Certainty::Maybe(_), args)) => {
+        Ok((_, Certainty::Maybe { .. }, args)) => {
             let subst = convert_canonical_args_for_result(infer_ctxt.interner, args);
             NextTraitSolveResult::Uncertain(chalk_ir::Canonical {
                 binders: subst.binders,