about summary refs log tree commit diff
path: root/compiler/rustc_borrowck
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2024-06-01 14:12:34 -0400
committerMichael Goulet <michael@errs.io>2024-06-03 09:27:52 -0400
commit54b2b7d460fd0847508b781219d380231c4fee72 (patch)
treee9a3f6b13cfd45e2fc7cbfccdc925647d6bbb0d2 /compiler/rustc_borrowck
parent084ccd23901366cef0b2921ae3cd069a74295ad9 (diff)
downloadrust-54b2b7d460fd0847508b781219d380231c4fee72.tar.gz
rust-54b2b7d460fd0847508b781219d380231c4fee72.zip
Make TraitEngines generic over error
Diffstat (limited to 'compiler/rustc_borrowck')
-rw-r--r--compiler/rustc_borrowck/src/type_check/constraint_conversion.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_borrowck/src/type_check/constraint_conversion.rs b/compiler/rustc_borrowck/src/type_check/constraint_conversion.rs
index b23ad2e1584..4037f04d0bc 100644
--- a/compiler/rustc_borrowck/src/type_check/constraint_conversion.rs
+++ b/compiler/rustc_borrowck/src/type_check/constraint_conversion.rs
@@ -13,6 +13,7 @@ use rustc_span::Span;
 use rustc_trait_selection::solve::deeply_normalize;
 use rustc_trait_selection::traits::query::type_op::custom::CustomTypeOp;
 use rustc_trait_selection::traits::query::type_op::{TypeOp, TypeOpOutput};
+use rustc_trait_selection::traits::FulfillmentError;
 
 use crate::{
     constraints::OutlivesConstraint,
@@ -286,7 +287,7 @@ impl<'a, 'tcx> ConstraintConversion<'a, 'tcx> {
                     ocx.infcx.at(&ObligationCause::dummy_with_span(self.span), self.param_env),
                     ty,
                 )
-                .map_err(|_| NoSolution)
+                .map_err(|_: Vec<FulfillmentError<'tcx>>| NoSolution)
             },
             "normalize type outlives obligation",
         )