bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

move closure down

Browse source
This commit is contained in:
Ellen 2022-05-06 11:40:18 +01:00
parent 2819b2d8c9
commit e4b8ed5aff
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_typeck/src/check/compare_method.rs
View file

@ -1001,14 +1001,6 @@ fn compare_generic_param_kinds<'tcx>(
(Const { .. }, Const { .. }) | (Type { .. }, Type { .. }) => false, (Const { .. }, Const { .. }) | (Type { .. }, Type { .. }) => false,
(Lifetime { .. }, _) | (_, Lifetime { .. }) => unreachable!(), (Lifetime { .. }, _) | (_, Lifetime { .. }) => unreachable!(),
} { } {
let make_param_message = |prefix: &str, param: &ty::GenericParamDef| match param.kind {
Const { .. } => {
format!("{} const parameter of type `{}`", prefix, tcx.type_of(param.def_id))
}
Type { .. } => format!("{} type parameter", prefix),
Lifetime { .. } => unreachable!(),
};
let param_impl_span = tcx.def_span(param_impl.def_id); let param_impl_span = tcx.def_span(param_impl.def_id);
let param_trait_span = tcx.def_span(param_trait.def_id); let param_trait_span = tcx.def_span(param_trait.def_id);
@ -1022,6 +1014,14 @@ fn compare_generic_param_kinds<'tcx>(
&tcx.def_path_str(tcx.parent(trait_item.def_id)) &tcx.def_path_str(tcx.parent(trait_item.def_id))
); );
let make_param_message = |prefix: &str, param: &ty::GenericParamDef| match param.kind {
Const { .. } => {
format!("{} const parameter of type `{}`", prefix, tcx.type_of(param.def_id))
}
Type { .. } => format!("{} type parameter", prefix),
Lifetime { .. } => unreachable!(),
};
let trait_header_span = tcx.def_ident_span(tcx.parent(trait_item.def_id)).unwrap(); let trait_header_span = tcx.def_ident_span(tcx.parent(trait_item.def_id)).unwrap();
err.span_label(trait_header_span, ""); err.span_label(trait_header_span, "");
err.span_label(param_trait_span, make_param_message("expected", param_trait)); err.span_label(param_trait_span, make_param_message("expected", param_trait));