diff options
| author | Michael Goulet <michael@errs.io> | 2023-05-25 17:29:22 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2023-05-25 17:29:22 +0000 |
| commit | 0a35db5e0d0f855ec9706280cef21fdc8a1f6ce5 (patch) | |
| tree | 11695cb4c0f1e43bfdaf544899ac64a57fc227c6 /compiler/rustc_trait_selection/src/traits/engine.rs | |
| parent | 91525a43243e088abb34fca3d43fd8588b8667e0 (diff) | |
| download | rust-0a35db5e0d0f855ec9706280cef21fdc8a1f6ce5.tar.gz rust-0a35db5e0d0f855ec9706280cef21fdc8a1f6ce5.zip | |
Fallible<_> -> Result<_, NoSolution>
Diffstat (limited to 'compiler/rustc_trait_selection/src/traits/engine.rs')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/engine.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/engine.rs b/compiler/rustc_trait_selection/src/traits/engine.rs index 000427bbe83..2c5ffd664fe 100644 --- a/compiler/rustc_trait_selection/src/traits/engine.rs +++ b/compiler/rustc_trait_selection/src/traits/engine.rs @@ -14,11 +14,11 @@ use rustc_infer::infer::canonical::{ }; use rustc_infer::infer::outlives::env::OutlivesEnvironment; use rustc_infer::infer::{DefineOpaqueTypes, InferCtxt, InferOk}; -use rustc_infer::traits::query::Fallible; use rustc_infer::traits::{ FulfillmentError, Obligation, ObligationCause, PredicateObligation, TraitEngineExt as _, }; use rustc_middle::arena::ArenaAllocatable; +use rustc_middle::traits::query::NoSolution; use rustc_middle::ty::error::TypeError; use rustc_middle::ty::ToPredicate; use rustc_middle::ty::TypeFoldable; @@ -235,7 +235,7 @@ impl<'a, 'tcx> ObligationCtxt<'a, 'tcx> { &self, inference_vars: CanonicalVarValues<'tcx>, answer: T, - ) -> Fallible<CanonicalQueryResponse<'tcx, T>> + ) -> Result<CanonicalQueryResponse<'tcx, T>, NoSolution> where T: Debug + TypeFoldable<TyCtxt<'tcx>>, Canonical<'tcx, QueryResponse<'tcx, T>>: ArenaAllocatable<'tcx>, |
