Simplify some expressions with pointers and references

Author: eduardosm

crates/assert-instr-macro/src/lib.rs

@@ -89,7 +89,7 @@ pub fn assert_instr(
             syn::Pat::Ident(ref i) => &i.ident,
             _ => panic!("must have bare arguments"),
         };
-        if let Some(&(_, ref tokens)) = invoc.args.iter().find(|a| *ident == a.0) {
+        if let Some((_, tokens)) = invoc.args.iter().find(|a| *ident == a.0) {
             input_vals.push(quote! { #tokens });
         } else {
             inputs.push(capture);
@@ -104,7 +104,7 @@ pub fn assert_instr(
                 v.clone().into_token_stream()
             ),
         };
-        if let Some(&(_, ref tokens)) = invoc.args.iter().find(|a| c.ident == a.0) {
+        if let Some((_, tokens)) = invoc.args.iter().find(|a| c.ident == a.0) {
             const_vals.push(quote! { #tokens });
         } else {
             panic!("const generics must have a value for tests");

crates/core_arch/src/x86/avx512bw.rs

@@ -18376,15 +18376,15 @@ mod tests {
         let a: __mmask64 =
             0b11111111_00000000_11111111_00000000_11111111_00000000_11111111_00000000;
         let mut r = 0;
-        _store_mask64(&mut r as *mut _ as *mut u64, a);
+        _store_mask64(&mut r, a);
         assert_eq!(r, a);
     }
 
     #[simd_test(enable = "avx512bw")]
     unsafe fn test_store_mask32() {
         let a: __mmask32 = 0b11111111_00000000_11111111_00000000;
         let mut r = 0;
-        _store_mask32(&mut r as *mut _ as *mut u32, a);
+        _store_mask32(&mut r, a);
         assert_eq!(r, a);
     }
 

crates/core_arch/src/x86/fxsr.rs

@@ -71,7 +71,7 @@ mod tests {
             FxsaveArea { data: [0; 512] }
         }
         fn ptr(&mut self) -> *mut u8 {
-            &mut self.data[0] as *mut _ as *mut u8
+            self.data.as_mut_ptr()
         }
     }
 

crates/core_arch/src/x86/sse2.rs

@@ -3881,23 +3881,23 @@ mod tests {
     unsafe fn test_mm_store_si128() {
         let a = _mm_set1_epi8(9);
         let mut r = _mm_set1_epi8(0);
-        _mm_store_si128(&mut r as *mut _ as *mut __m128i, a);
+        _mm_store_si128(&mut r, a);
         assert_eq_m128i(r, a);
     }
 
     #[simd_test(enable = "sse2")]
     unsafe fn test_mm_storeu_si128() {
         let a = _mm_set1_epi8(9);
         let mut r = _mm_set1_epi8(0);
-        _mm_storeu_si128(&mut r as *mut _ as *mut __m128i, a);
+        _mm_storeu_si128(&mut r, a);
         assert_eq_m128i(r, a);
     }
 
     #[simd_test(enable = "sse2")]
     unsafe fn test_mm_storel_epi64() {
         let a = _mm_setr_epi64x(2, 9);
         let mut r = _mm_set1_epi8(0);
-        _mm_storel_epi64(&mut r as *mut _ as *mut __m128i, a);
+        _mm_storel_epi64(&mut r, a);
         assert_eq_m128i(r, _mm_setr_epi64x(2, 0));
     }
 

crates/core_arch/src/x86/xsave.rs

@@ -180,7 +180,7 @@ mod tests {
             XsaveArea { data: [0; 2560] }
         }
         fn ptr(&mut self) -> *mut u8 {
-            &mut self.data[0] as *mut _ as *mut u8
+            self.data.as_mut_ptr()
         }
     }
 

crates/core_arch/src/x86_64/fxsr.rs

@@ -71,7 +71,7 @@ mod tests {
             FxsaveArea { data: [0; 512] }
         }
         fn ptr(&mut self) -> *mut u8 {
-            &mut self.data[0] as *mut _ as *mut u8
+            self.data.as_mut_ptr()
         }
     }
 

crates/stdarch-test/src/disassembly.rs

@@ -24,7 +24,7 @@ fn normalize(mut symbol: &str) -> String {
 
     // Remove Rust paths
     if let Some(last_colon) = symbol.rfind(':') {
-        symbol = (&symbol[last_colon + 1..]).to_string();
+        symbol = symbol[last_colon + 1..].to_string();
     }
 
     // Normalize to no leading underscore to handle platforms that may
@@ -34,7 +34,7 @@ fn normalize(mut symbol: &str) -> String {
     }
     // Windows/x86 has a suffix such as @@4.
     if let Some(idx) = symbol.find("@@") {
-        symbol = (&symbol[..idx]).to_string();
+        symbol = symbol[..idx].to_string();
     }
     symbol
 }