Remove redundant len binding

tesuji · tesuji · commit a5d0c2c17482 · 2020-07-28T03:16:55.000Z
diff --git a/library/std/src/sys/windows/mod.rs b/library/std/src/sys/windows/mod.rs
@@ -99,11 +99,10 @@ pub fn decode_error_kind(errno: i32) -> ErrorKind {
 
 pub fn unrolled_find_u16s(needle: u16, haystack: &[u16]) -> Option<usize> {
     let ptr = haystack.as_ptr();
-    let mut len = haystack.len();
     let mut start = &haystack[..];
 
     // For performance reasons unfold the loop eight times.
-    while len >= 8 {
+    while start.len() >= 8 {
         if start[0] == needle {
             return Some((start.as_ptr() as usize - ptr as usize) / 2);
         }
@@ -130,7 +129,6 @@ pub fn unrolled_find_u16s(needle: u16, haystack: &[u16]) -> Option<usize> {
         }
 
         start = &start[8..];
-        len -= 8;
     }
 
     for (i, c) in start.iter().enumerate() {

Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,10 @@ pub fn decode_error_kind(errno: i32) -> ErrorKind {`
`99`	`99`
`100`	`100`	`pub fn unrolled_find_u16s(needle: u16, haystack: &[u16]) -> Option<usize> {`
`101`	`101`	`let ptr = haystack.as_ptr();`
`102`		`- let mut len = haystack.len();`
`103`	`102`	`let mut start = &haystack[..];`
`104`	`103`
`105`	`104`	`// For performance reasons unfold the loop eight times.`
`106`		`- while len >= 8 {`
	`105`	`+ while start.len() >= 8 {`
`107`	`106`	`if start[0] == needle {`
`108`	`107`	`return Some((start.as_ptr() as usize - ptr as usize) / 2);`
`109`	`108`	`}`
`@@ -130,7 +129,6 @@ pub fn unrolled_find_u16s(needle: u16, haystack: &[u16]) -> Option<usize> {`
`130`	`129`	`}`
`131`	`130`
`132`	`131`	`start = &start[8..];`
`133`		`- len -= 8;`
`134`	`132`	`}`
`135`	`133`
`136`	`134`	`for (i, c) in start.iter().enumerate() {`