@@ -2692,6 +2692,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
2692
2692
return false ;
2693
2693
}
2694
2694
2695
+ if expr. span . in_derive_expansion ( ) {
2696
+ // Ignore if span is from derive macro.
2697
+ return false ;
2698
+ }
2699
+
2695
2700
let Ok ( src) = self . tcx . sess . source_map ( ) . span_to_snippet ( expr. span ) else {
2696
2701
return false ;
2697
2702
} ;
@@ -2896,12 +2901,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
2896
2901
( None , _) | ( _, None ) => ( true , true ) ,
2897
2902
_ => ( false , false ) ,
2898
2903
} ;
2899
- if !expr. span . in_derive_expansion ( ) {
2900
- suggest_to_change_suffix_or_into ( err, f2e_is_fallible, e2f_is_fallible) ;
2901
- true
2902
- } else {
2903
- false
2904
- }
2904
+ suggest_to_change_suffix_or_into ( err, f2e_is_fallible, e2f_is_fallible) ;
2905
+ true
2905
2906
}
2906
2907
( ty:: Uint ( exp) , ty:: Uint ( found) ) => {
2907
2908
let ( f2e_is_fallible, e2f_is_fallible) = match ( exp. bit_width ( ) , found. bit_width ( ) )
@@ -2913,12 +2914,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
2913
2914
( None , _) | ( _, None ) => ( true , true ) ,
2914
2915
_ => ( false , false ) ,
2915
2916
} ;
2916
- if !expr. span . in_derive_expansion ( ) {
2917
- suggest_to_change_suffix_or_into ( err, f2e_is_fallible, e2f_is_fallible) ;
2918
- true
2919
- } else {
2920
- false
2921
- }
2917
+ suggest_to_change_suffix_or_into ( err, f2e_is_fallible, e2f_is_fallible) ;
2918
+ true
2922
2919
}
2923
2920
( & ty:: Int ( exp) , & ty:: Uint ( found) ) => {
2924
2921
let ( f2e_is_fallible, e2f_is_fallible) = match ( exp. bit_width ( ) , found. bit_width ( ) )
0 commit comments