diff options
| author | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2022-01-26 14:47:03 +0000 |
|---|---|---|
| committer | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2022-02-02 15:40:11 +0000 |
| commit | 38f50d1ecb2adf9f9e6305b22cdee96bd65f9cbe (patch) | |
| tree | dc6c1a79606c3f72d01698198e02466c676f6242 /compiler/rustc_trait_selection | |
| parent | a745797142f932877695a0a3cd1b452ab67e59df (diff) | |
Eagerly merge hidden types.
Diffstat (limited to 'compiler/rustc_trait_selection')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/fulfill.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/select/mod.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/fulfill.rs b/compiler/rustc_trait_selection/src/traits/fulfill.rs index 68dd1cd2616..274f8a3ef79 100644 --- a/compiler/rustc_trait_selection/src/traits/fulfill.rs +++ b/compiler/rustc_trait_selection/src/traits/fulfill.rs @@ -652,7 +652,7 @@ impl<'a, 'b, 'tcx> FulfillProcessor<'a, 'b, 'tcx> { &obligation.cause, obligation.param_env, ) { - Ok(value) => ProcessResult::Changed(mk_pending(value)), + Ok(value) => ProcessResult::Changed(mk_pending(value.obligations)), Err(err) => ProcessResult::Error(FulfillmentErrorCode::CodeSubtypeError( ExpectedFound::new(true, a, b), err, diff --git a/compiler/rustc_trait_selection/src/traits/select/mod.rs b/compiler/rustc_trait_selection/src/traits/select/mod.rs index 3b99183d8eb..35818786cbb 100644 --- a/compiler/rustc_trait_selection/src/traits/select/mod.rs +++ b/compiler/rustc_trait_selection/src/traits/select/mod.rs @@ -705,8 +705,8 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> { &obligation.cause, obligation.param_env, ) { - Ok(obligations) => { - self.evaluate_predicates_recursively(previous_stack, obligations) + Ok(res) => { + self.evaluate_predicates_recursively(previous_stack, res.obligations) } Err(_) => Ok(EvaluatedToErr), } |