gaming :3

Author: lcnr

compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs

@@ -425,25 +425,27 @@ where
         //
         // The actual solver logic happens in `ecx.compute_goal`.
         let result = ensure_sufficient_stack(|| {
-            search_graph.with_new_goal(
-                cx,
-                canonical_input,
-                step_kind_from_parent,
-                &mut canonical_goal_evaluation,
-                |search_graph, cx, canonical_input, canonical_goal_evaluation| {
-                    EvalCtxt::enter_canonical(
-                        cx,
-                        search_graph,
-                        canonical_input,
-                        canonical_goal_evaluation,
-                        |ecx, goal| {
-                            let result = ecx.compute_goal(goal);
-                            ecx.inspect.query_result(result);
-                            result
-                        },
-                    )
-                },
-            )
+            search_graph
+                .with_new_goal(
+                    cx,
+                    canonical_input,
+                    step_kind_from_parent,
+                    &mut canonical_goal_evaluation,
+                    |search_graph, cx, canonical_input, canonical_goal_evaluation| {
+                        EvalCtxt::enter_canonical(
+                            cx,
+                            search_graph,
+                            canonical_input,
+                            canonical_goal_evaluation,
+                            |ecx, goal| {
+                                let result = ecx.compute_goal(goal);
+                                ecx.inspect.query_result(result);
+                                result
+                            },
+                        )
+                    },
+                )
+                .1
         });
 
         canonical_goal_evaluation.query_result(result);

compiler/rustc_type_ir/src/data_structures/mod.rs

@@ -2,7 +2,7 @@ use std::hash::BuildHasherDefault;
 
 pub use ena::unify::{NoError, UnifyKey, UnifyValue};
 use rustc_hash::FxHasher;
-pub use rustc_hash::{FxHashMap as HashMap, FxHashSet as HashSet};
+pub use rustc_hash::{FxBuildHasher as BuildHasher, FxHashMap as HashMap, FxHashSet as HashSet};
 
 pub type IndexMap<K, V> = indexmap::IndexMap<K, V, BuildHasherDefault<FxHasher>>;
 pub type IndexSet<V> = indexmap::IndexSet<V, BuildHasherDefault<FxHasher>>;