Start some fixup

Author: DJMcNab

Cargo.lock

@@ -8,7 +8,7 @@ log = "0.4"
 anyhow = "1.0.75"
 serde = { version = "1.0.192", features = ["derive"] }
 serde_json = "1.0.108"
-rustc_utils = { git = "https://github.com/DJMcNab/rustc_plugin", rev = "dee1d90c770bb44a6c3479c1f2a05cd4890e3010" }
+rustc_utils = { git = "https://github.com/DJMcNab/rustc_plugin", rev = "70646a67a5591b48a275a7e97cd5f63ff4cf873c" }
 fluid-let = "1.0.0"
 itertools = "0.14.0"
 

Cargo.toml

@@ -12,7 +12,7 @@ license = "MIT"
 [dependencies]
 argus-lib = { version = "0.1.19", path = "../argus" }
 argus-ext = { version = "0.1.19", path = "../argus-ext" }
-rustc_plugin = { git = "https://github.com/DJMcNab/rustc_plugin", rev = "dee1d90c770bb44a6c3479c1f2a05cd4890e3010" }
+rustc_plugin = { git = "https://github.com/DJMcNab/rustc_plugin", rev = "70646a67a5591b48a275a7e97cd5f63ff4cf873c" }
 
 rustc_utils.workspace = true
 log.workspace = true

crates/argus-cli/Cargo.toml

@@ -2,7 +2,8 @@ use rustc_hashes::Hash64;
 use rustc_infer::{infer::InferCtxt, traits::PredicateObligation};
 use rustc_middle::ty::{self, Predicate, TypeFoldable};
 use rustc_trait_selection::{
-  solve::InferCtxtSelectExt, traits::query::NoSolution,
+  solve::InferCtxtSelectExt,
+  traits::{query::NoSolution, SelectionContext},
 };
 
 use crate::{ty::TyCtxtExt, EvaluationResult};
@@ -67,8 +68,9 @@ impl<'tcx> InferCtxtExt<'tcx> for InferCtxt<'tcx> {
         param_env: obligation.param_env,
         recursion_depth: obligation.recursion_depth,
       };
+      let mut selection_ctx = SelectionContext::new(self);
 
-      match self.select_in_new_trait_solver(&trait_obligation) {
+      match selection_ctx.poly_select(&trait_obligation) {
         Ok(Some(_)) => Ok(Certainty::Yes),
         Ok(None) => Ok(Certainty::Maybe(MaybeCause::Ambiguity)),
         _ => Err(NoSolution),

crates/argus-ext/src/infer.rs

@@ -163,12 +163,12 @@ impl<'a, 'tcx: 'a> FnCtxtExt<'tcx> for FnCtxtSimulator<'a, 'tcx> {
     let find_param_matching = |matches: &dyn Fn(ty::ParamTerm) -> bool| {
       predicate_args.iter().find_map(|arg| {
         arg.walk().find(|arg| {
-          if let ty::GenericArgKind::Type(ty) = arg.unpack()
+          if let ty::GenericArgKind::Type(ty) = arg.kind()
             && let ty::Param(param_ty) = *ty.kind()
             && matches(ty::ParamTerm::Ty(param_ty))
           {
             true
-          } else if let ty::GenericArgKind::Const(ct) = arg.unpack()
+          } else if let ty::GenericArgKind::Const(ct) = arg.kind()
             && let ty::ConstKind::Param(param_ct) = ct.kind()
             && matches(ty::ParamTerm::Const(param_ct))
           {
@@ -424,7 +424,7 @@ impl<'a, 'tcx: 'a> FnCtxtExt<'tcx> for FnCtxtSimulator<'a, 'tcx> {
         // Handle `Self` param specifically, since it's separated in
         // the path representation
         if let Some(self_ty) = self_ty
-          && let ty::GenericArgKind::Type(ty) = param.unpack()
+          && let ty::GenericArgKind::Type(ty) = param.kind()
           && ty == self.tcx.types.self_param
         {
           error.obligation.cause.span = self_ty
@@ -440,7 +440,7 @@ impl<'a, 'tcx: 'a> FnCtxtExt<'tcx> for FnCtxtSimulator<'a, 'tcx> {
         }
         // Handle `Self` param specifically, since it's separated in
         // the path representation
-        if let ty::GenericArgKind::Type(ty) = param.unpack()
+        if let ty::GenericArgKind::Type(ty) = param.kind()
           && ty == self.tcx.types.self_param
         {
           error.obligation.cause.span = self_ty
@@ -820,7 +820,7 @@ impl<'a, 'tcx: 'a> FnCtxtExt<'tcx> for FnCtxtSimulator<'a, 'tcx> {
       return Ok(expr);
     }
 
-    let ty::GenericArgKind::Type(in_ty) = in_ty.unpack() else {
+    let ty::GenericArgKind::Type(in_ty) = in_ty.kind() else {
       return Err(expr);
     };
 
@@ -1132,7 +1132,7 @@ fn find_param_in_ty<'tcx>(
     if arg == param_to_point_at {
       return true;
     }
-    if let ty::GenericArgKind::Type(ty) = arg.unpack()
+    if let ty::GenericArgKind::Type(ty) = arg.kind()
       && let ty::Alias(ty::Projection | ty::Inherent, ..) = ty.kind()
     {
       // This logic may seem a bit strange, but typically when

crates/argus-ext/src/rustc/fn_ctx.rs

@@ -328,10 +328,9 @@ impl<'tcx> TyCtxtExt<'tcx> for TyCtxt<'tcx> {
 impl PredicateObligationExt for PredicateObligation<'_> {
   fn range(&self, tcx: &TyCtxt, body_id: BodyId) -> CharRange {
     let source_map = tcx.sess.source_map();
-    let hir = tcx.hir();
 
     let hir_id = tcx.hir_body_owner(body_id);
-    let body_span = hir.span(hir_id);
+    let body_span = tcx.hir_span(hir_id);
 
     // Backup span of the DefId
 

crates/argus-ext/src/ty/impl.rs

@@ -16,7 +16,7 @@ impl TermDef {
   where
     S: serde::Serializer,
   {
-    TermKindDef::serialize(&value.unpack(), s)
+    TermKindDef::serialize(&value.kind(), s)
   }
 }
 

crates/argus-ser/src/term.rs

@@ -301,7 +301,7 @@ impl<'tcx> AliasTyKindDef<'tcx> {
         (
           ty::AliasTyKind::Projection
           | ty::AliasTyKind::Inherent
-          | ty::AliasTyKind::Weak,
+          | ty::AliasTyKind::Free,
           ref data,
         ) => {
           if !(infcx.should_print_verbose() || with_no_queries())

crates/argus-ser/src/ty.rs

@@ -37,7 +37,7 @@ ts-rs = { version = "7.1.1", features = [
 ], optional = true }
 
 [dev-dependencies]
-rustc_utils = { git = "https://github.com/DJMcNab/rustc_plugin", rev = "dee1d90c770bb44a6c3479c1f2a05cd4890e3010", features = [
+rustc_utils = { git = "https://github.com/DJMcNab/rustc_plugin", rev = "70646a67a5591b48a275a7e97cd5f63ff4cf873c", features = [
   "serde",
   "ts-rs",
 ] }