about summary refs log tree commit diff
path: root/compiler/rustc_hir_analysis/src
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2024-06-01 15:00:02 -0400
committerMichael Goulet <michael@errs.io>2024-06-03 09:27:52 -0400
commit94a524ed1163f4876544366586dc1b87deb13e95 (patch)
tree20295042546ef296ddfbee4d500aebec8c2b78a5 /compiler/rustc_hir_analysis/src
parenteb0a70a5578be0ae164cb802898ea98d41e95f13 (diff)
downloadrust-94a524ed1163f4876544366586dc1b87deb13e95.tar.gz
rust-94a524ed1163f4876544366586dc1b87deb13e95.zip
Use ScrubbedTraitError in more places
Diffstat (limited to 'compiler/rustc_hir_analysis/src')
-rw-r--r--compiler/rustc_hir_analysis/src/coherence/orphan.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/compiler/rustc_hir_analysis/src/coherence/orphan.rs b/compiler/rustc_hir_analysis/src/coherence/orphan.rs
index a4818b25f98..d2eb0cb5a7b 100644
--- a/compiler/rustc_hir_analysis/src/coherence/orphan.rs
+++ b/compiler/rustc_hir_analysis/src/coherence/orphan.rs
@@ -12,9 +12,11 @@ use rustc_middle::ty::{TypeFoldable, TypeFolder, TypeSuperFoldable};
 use rustc_middle::ty::{TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeVisitor};
 use rustc_middle::{bug, span_bug};
 use rustc_span::def_id::{DefId, LocalDefId};
-use rustc_trait_selection::traits::{self, IsFirstInputType, UncoveredTyParams};
-use rustc_trait_selection::traits::{FulfillmentError, StructurallyNormalizeExt, TraitEngineExt};
+use rustc_trait_selection::traits::{
+    self, IsFirstInputType, ScrubbedTraitError, UncoveredTyParams,
+};
 use rustc_trait_selection::traits::{OrphanCheckErr, OrphanCheckMode};
+use rustc_trait_selection::traits::{StructurallyNormalizeExt, TraitEngineExt};
 
 #[instrument(level = "debug", skip(tcx))]
 pub(crate) fn orphan_check_impl(
@@ -317,8 +319,7 @@ fn orphan_check<'tcx>(
         }
 
         let ty = if infcx.next_trait_solver() {
-            let mut fulfill_cx =
-                <dyn traits::TraitEngine<'tcx, FulfillmentError<'tcx>>>::new(&infcx);
+            let mut fulfill_cx = <dyn traits::TraitEngine<'tcx, ScrubbedTraitError>>::new(&infcx);
             infcx
                 .at(&cause, ty::ParamEnv::empty())
                 .structurally_normalize(ty, &mut *fulfill_cx)