mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not overwrite obligations

Browse Source
This commit is contained in:
lcnr 2023-05-18 15:00:30 +02:00
parent a673ad6b57
commit 3e4ed61c09
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_infer/src/infer/opaque_types.rs
View File

@ -530,19 +530,18 @@ impl<'tcx> InferCtxt<'tcx> {
// these are the same span, but not in cases like `-> (impl // these are the same span, but not in cases like `-> (impl
// Foo, impl Bar)`. // Foo, impl Bar)`.
let span = cause.span; let span = cause.span;
let mut obligations = vec![];
let prev = self.inner.borrow_mut().opaque_types().register( let prev = self.inner.borrow_mut().opaque_types().register(
OpaqueTypeKey { def_id, substs }, OpaqueTypeKey { def_id, substs },
OpaqueHiddenType { ty: hidden_ty, span }, OpaqueHiddenType { ty: hidden_ty, span },
origin, origin,
); );
if let Some(prev) = prev { let mut obligations = if let Some(prev) = prev {
obligations = self self.at(&cause, param_env)
.at(&cause, param_env)
.eq_exp(DefineOpaqueTypes::Yes, a_is_expected, prev, hidden_ty)? .eq_exp(DefineOpaqueTypes::Yes, a_is_expected, prev, hidden_ty)?
.obligations; .obligations
} } else {
Vec::new()
};
let item_bounds = tcx.explicit_item_bounds(def_id); let item_bounds = tcx.explicit_item_bounds(def_id);