@@ -951,7 +951,7 @@ fn detect_manual_memcpy<'a, 'tcx>(
951
951
) {
952
952
if let Some ( higher:: Range {
953
953
start : Some ( start) ,
954
- ref end,
954
+ end : Some ( end) ,
955
955
limits,
956
956
} ) = higher:: range ( cx, arg)
957
957
{
@@ -990,35 +990,31 @@ fn detect_manual_memcpy<'a, 'tcx>(
990
990
}
991
991
} ;
992
992
993
- let print_limit = |end : & Option < & Expr < ' _ > > , offset : Offset , var_name : & str | {
994
- if let Some ( end) = * end {
995
- if_chain ! {
996
- if let ExprKind :: MethodCall ( ref method, _, ref len_args) = end. kind;
997
- if method. ident. name == sym!( len) ;
998
- if len_args. len( ) == 1 ;
999
- if let Some ( arg) = len_args. get( 0 ) ;
1000
- if snippet( cx, arg. span, "??" ) == var_name;
1001
- then {
1002
- return if offset. negate {
1003
- format!( "({} - {})" , snippet( cx, end. span, "<src>.len()" ) , offset. value)
1004
- } else {
1005
- String :: new( )
1006
- } ;
1007
- }
993
+ let print_limit = |end : & Expr < ' _ > , offset : Offset , var_name : & str | {
994
+ if_chain ! {
995
+ if let ExprKind :: MethodCall ( ref method, _, ref len_args) = end. kind;
996
+ if method. ident. name == sym!( len) ;
997
+ if len_args. len( ) == 1 ;
998
+ if let Some ( arg) = len_args. get( 0 ) ;
999
+ if snippet( cx, arg. span, "??" ) == var_name;
1000
+ then {
1001
+ return if offset. negate {
1002
+ format!( "({} - {})" , snippet( cx, end. span, "<src>.len()" ) , offset. value)
1003
+ } else {
1004
+ String :: new( )
1005
+ } ;
1008
1006
}
1007
+ }
1009
1008
1010
- let end_str = match limits {
1011
- ast:: RangeLimits :: Closed => {
1012
- let end = sugg:: Sugg :: hir ( cx, end, "<count>" ) ;
1013
- format ! ( "{}" , end + sugg:: ONE )
1014
- } ,
1015
- ast:: RangeLimits :: HalfOpen => format ! ( "{}" , snippet( cx, end. span, ".." ) ) ,
1016
- } ;
1009
+ let end_str = match limits {
1010
+ ast:: RangeLimits :: Closed => {
1011
+ let end = sugg:: Sugg :: hir ( cx, end, "<count>" ) ;
1012
+ format ! ( "{}" , end + sugg:: ONE )
1013
+ } ,
1014
+ ast:: RangeLimits :: HalfOpen => format ! ( "{}" , snippet( cx, end. span, ".." ) ) ,
1015
+ } ;
1017
1016
1018
- print_sum ( & Offset :: positive ( end_str) , & offset)
1019
- } else {
1020
- ".." . into ( )
1021
- }
1017
+ print_sum ( & Offset :: positive ( end_str) , & offset)
1022
1018
} ;
1023
1019
1024
1020
// The only statements in the for loops can be indexed assignments from
0 commit comments