@@ -1001,14 +1001,6 @@ fn compare_generic_param_kinds<'tcx>(
1001
1001
( Const { .. } , Const { .. } ) | ( Type { .. } , Type { .. } ) => false ,
1002
1002
( Lifetime { .. } , _) | ( _, Lifetime { .. } ) => unreachable ! ( ) ,
1003
1003
} {
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
-
1012
1004
let param_impl_span = tcx. def_span ( param_impl. def_id ) ;
1013
1005
let param_trait_span = tcx. def_span ( param_trait. def_id ) ;
1014
1006
@@ -1022,6 +1014,14 @@ fn compare_generic_param_kinds<'tcx>(
1022
1014
& tcx. def_path_str( tcx. parent( trait_item. def_id) )
1023
1015
) ;
1024
1016
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
+
1025
1025
let trait_header_span = tcx. def_ident_span ( tcx. parent ( trait_item. def_id ) ) . unwrap ( ) ;
1026
1026
err. span_label ( trait_header_span, "" ) ;
1027
1027
err. span_label ( param_trait_span, make_param_message ( "expected" , param_trait) ) ;
0 commit comments