bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Reduce follow-up errors that are not helpful

Browse source
This commit is contained in:
Oli Scherer 2022-01-28 17:18:53 +00:00
parent 6560d77a53
commit 59d0bff0e6
27 changed files with 40 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_borrowck/src/region_infer/opaque_types.rs
View file

@ -58,7 +58,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
) -> VecMap<OpaqueTypeKey<'tcx>, Ty<'tcx>> {
opaque_ty_decls
.into_iter()
.filter_map(|(opaque_type_key, (concrete_type, decl_span, origin))| {
.map(|(opaque_type_key, (concrete_type, decl_span, origin))| {
let substs = opaque_type_key.substs;
// FIXME: why are the spans in decl_span often DUMMY_SP?
let span = decl_span.substitute_dummy(span);
@ -112,8 +112,14 @@ impl<'tcx> RegionInferenceContext<'tcx> {
span,
);
check_opaque_type_parameter_valid(infcx.tcx, opaque_type_key, origin, span)
.then_some((opaque_type_key, remapped_type))
(
opaque_type_key,
if check_opaque_type_parameter_valid(infcx.tcx, opaque_type_key, origin, span) {
remapped_type
} else {
infcx.tcx.ty_error()
},
)
})
.collect()
}