@@ -1001,14 +1001,6 @@ fn compare_generic_param_kinds<'tcx>(
10011001 ( Const { .. } , Const { .. } ) | ( Type { .. } , Type { .. } ) => false ,
10021002 ( Lifetime { .. } , _) | ( _, Lifetime { .. } ) => unreachable ! ( ) ,
10031003 } {
1004- let make_param_message = |prefix : & str , param : & ty:: GenericParamDef | match param. kind {
1005- Const { .. } => {
1006- format ! ( "{} const parameter of type `{}`" , prefix, tcx. type_of( param. def_id) )
1007- }
1008- Type { .. } => format ! ( "{} type parameter" , prefix) ,
1009- Lifetime { .. } => unreachable ! ( ) ,
1010- } ;
1011-
10121004 let param_impl_span = tcx. def_span ( param_impl. def_id ) ;
10131005 let param_trait_span = tcx. def_span ( param_trait. def_id ) ;
10141006
@@ -1022,6 +1014,14 @@ fn compare_generic_param_kinds<'tcx>(
10221014 & tcx. def_path_str( tcx. parent( trait_item. def_id) )
10231015 ) ;
10241016
1017+ let make_param_message = |prefix : & str , param : & ty:: GenericParamDef | match param. kind {
1018+ Const { .. } => {
1019+ format ! ( "{} const parameter of type `{}`" , prefix, tcx. type_of( param. def_id) )
1020+ }
1021+ Type { .. } => format ! ( "{} type parameter" , prefix) ,
1022+ Lifetime { .. } => unreachable ! ( ) ,
1023+ } ;
1024+
10251025 let trait_header_span = tcx. def_ident_span ( tcx. parent ( trait_item. def_id ) ) . unwrap ( ) ;
10261026 err. span_label ( trait_header_span, "" ) ;
10271027 err. span_label ( param_trait_span, make_param_message ( "expected" , param_trait) ) ;
0 commit comments