Fix some clippy lints (#937)

jyn514 · web-flow · commit de6d3fcb71ad · 2020-11-02T00:53:39.000Z
diff --git a/crates/assert-instr-macro/build.rs b/crates/assert-instr-macro/build.rs
@@ -6,7 +6,7 @@ fn main() {
         .ok()
         .and_then(|s| s.parse().ok())
         .unwrap_or(0);
-    let profile = env::var("PROFILE").unwrap_or(String::new());
+    let profile = env::var("PROFILE").unwrap_or_default();
     if profile == "release" || opt_level >= 2 {
         println!("cargo:rustc-cfg=optimized");
     }
diff --git a/crates/assert-instr-macro/src/lib.rs b/crates/assert-instr-macro/src/lib.rs
@@ -179,7 +179,7 @@ impl syn::parse::Parse for Invoc {
                 continue;
             }
             if input.parse::<Token![.]>().is_ok() {
-                instr.push_str(".");
+                instr.push('.');
                 continue;
             }
             if let Ok(s) = input.parse::<syn::LitStr>() {
diff --git a/crates/core_arch/src/x86/avx2.rs b/crates/core_arch/src/x86/avx2.rs
@@ -4052,7 +4052,7 @@ extern "C" {
 
 #[cfg(test)]
 mod tests {
-    use std;
+
     use stdarch_test::simd_test;
 
     use crate::core_arch::x86::*;
diff --git a/crates/core_arch/src/x86/avx512f.rs b/crates/core_arch/src/x86/avx512f.rs
@@ -22727,7 +22727,7 @@ extern "C" {
 
 #[cfg(test)]
 mod tests {
-    use std;
+
     use stdarch_test::simd_test;
 
     use crate::core_arch::x86::*;
diff --git a/crates/core_arch/src/x86/avx512ifma.rs b/crates/core_arch/src/x86/avx512ifma.rs
@@ -105,7 +105,7 @@ extern "C" {
 
 #[cfg(test)]
 mod tests {
-    use std;
+
     use stdarch_test::simd_test;
 
     use crate::core_arch::x86::*;
diff --git a/crates/core_arch/src/x86/fma.rs b/crates/core_arch/src/x86/fma.rs
@@ -500,7 +500,7 @@ extern "C" {
 
 #[cfg(test)]
 mod tests {
-    use std;
+
     use stdarch_test::simd_test;
 
     use crate::core_arch::x86::*;
diff --git a/crates/core_arch/src/x86/fxsr.rs b/crates/core_arch/src/x86/fxsr.rs
@@ -6,9 +6,9 @@ use stdarch_test::assert_instr;
 #[allow(improper_ctypes)]
 extern "C" {
     #[link_name = "llvm.x86.fxsave"]
-    fn fxsave(p: *mut u8) -> ();
+    fn fxsave(p: *mut u8);
     #[link_name = "llvm.x86.fxrstor"]
-    fn fxrstor(p: *const u8) -> ();
+    fn fxrstor(p: *const u8);
 }
 
 /// Saves the `x87` FPU, `MMX` technology, `XMM`, and `MXCSR` registers to the
diff --git a/crates/core_arch/src/x86/rtm.rs b/crates/core_arch/src/x86/rtm.rs
@@ -20,9 +20,9 @@ extern "C" {
     #[link_name = "llvm.x86.xbegin"]
     fn x86_xbegin() -> i32;
     #[link_name = "llvm.x86.xend"]
-    fn x86_xend() -> ();
+    fn x86_xend();
     #[link_name = "llvm.x86.xabort"]
-    fn x86_xabort(imm8: i8) -> ();
+    fn x86_xabort(imm8: i8);
     #[link_name = "llvm.x86.xtest"]
     fn x86_xtest() -> i32;
 }
diff --git a/crates/core_arch/src/x86/sse.rs b/crates/core_arch/src/x86/sse.rs
@@ -3106,8 +3106,8 @@ mod tests {
         let mut p = vals.as_mut_ptr();
 
         if (p as usize) & 0xf != 0 {
-            ofs = (16 - (p as usize) & 0xf) >> 2;
-            p = p.offset(ofs as isize);
+            ofs = ((16 - (p as usize)) & 0xf) >> 2;
+            p = p.add(ofs);
         }
 
         _mm_store1_ps(p, *black_box(&a));
@@ -3132,8 +3132,8 @@ mod tests {
 
         // Align p to 16-byte boundary
         if (p as usize) & 0xf != 0 {
-            ofs = (16 - (p as usize) & 0xf) >> 2;
-            p = p.offset(ofs as isize);
+            ofs = ((16 - (p as usize)) & 0xf) >> 2;
+            p = p.add(ofs);
         }
 
         _mm_store_ps(p, *black_box(&a));
@@ -3158,8 +3158,8 @@ mod tests {
 
         // Align p to 16-byte boundary
         if (p as usize) & 0xf != 0 {
-            ofs = (16 - (p as usize) & 0xf) >> 2;
-            p = p.offset(ofs as isize);
+            ofs = ((16 - (p as usize)) & 0xf) >> 2;
+            p = p.add(ofs);
         }
 
         _mm_storer_ps(p, *black_box(&a));
diff --git a/crates/core_arch/src/x86/xsave.rs b/crates/core_arch/src/x86/xsave.rs
@@ -7,19 +7,19 @@ use stdarch_test::assert_instr;
 #[allow(improper_ctypes)]
 extern "C" {
     #[link_name = "llvm.x86.xsave"]
-    fn xsave(p: *mut u8, hi: u32, lo: u32) -> ();
+    fn xsave(p: *mut u8, hi: u32, lo: u32);
     #[link_name = "llvm.x86.xrstor"]
-    fn xrstor(p: *const u8, hi: u32, lo: u32) -> ();
+    fn xrstor(p: *const u8, hi: u32, lo: u32);
     #[link_name = "llvm.x86.xsetbv"]
-    fn xsetbv(v: u32, hi: u32, lo: u32) -> ();
+    fn xsetbv(v: u32, hi: u32, lo: u32);
     #[link_name = "llvm.x86.xsaveopt"]
-    fn xsaveopt(p: *mut u8, hi: u32, lo: u32) -> ();
+    fn xsaveopt(p: *mut u8, hi: u32, lo: u32);
     #[link_name = "llvm.x86.xsavec"]
-    fn xsavec(p: *mut u8, hi: u32, lo: u32) -> ();
+    fn xsavec(p: *mut u8, hi: u32, lo: u32);
     #[link_name = "llvm.x86.xsaves"]
-    fn xsaves(p: *mut u8, hi: u32, lo: u32) -> ();
+    fn xsaves(p: *mut u8, hi: u32, lo: u32);
     #[link_name = "llvm.x86.xrstors"]
-    fn xrstors(p: *const u8, hi: u32, lo: u32) -> ();
+    fn xrstors(p: *const u8, hi: u32, lo: u32);
 }
 
 /// Performs a full or partial save of the enabled processor states to memory at
diff --git a/crates/core_arch/src/x86_64/avx512f.rs b/crates/core_arch/src/x86_64/avx512f.rs
@@ -1,11 +1,12 @@
 //use crate::{
+//
 //    core_arch::{simd::*, simd_llvm::*, x86::*},
 //    mem::transmute,
 //};
 
 #[cfg(test)]
 mod tests {
-    use std;
+
     use stdarch_test::simd_test;
 
     use crate::core_arch::x86::*;
@@ -2123,7 +2124,7 @@ mod tests {
         let e = _mm512_set1_pd(0.3333333333333333);
         assert_eq_m512d(r, e);
         let r = _mm512_div_round_pd(a, b, _MM_FROUND_TO_ZERO | _MM_FROUND_NO_EXC);
-        let e = _mm512_set1_pd(0.33333333333333334);
+        let e = _mm512_set1_pd(0.3333333333333333);
         assert_eq_m512d(r, e);
     }
 
diff --git a/crates/core_arch/src/x86_64/fxsr.rs b/crates/core_arch/src/x86_64/fxsr.rs
@@ -6,9 +6,9 @@ use stdarch_test::assert_instr;
 #[allow(improper_ctypes)]
 extern "C" {
     #[link_name = "llvm.x86.fxsave64"]
-    fn fxsave64(p: *mut u8) -> ();
+    fn fxsave64(p: *mut u8);
     #[link_name = "llvm.x86.fxrstor64"]
-    fn fxrstor64(p: *const u8) -> ();
+    fn fxrstor64(p: *const u8);
 }
 
 /// Saves the `x87` FPU, `MMX` technology, `XMM`, and `MXCSR` registers to the
diff --git a/crates/core_arch/src/x86_64/xsave.rs b/crates/core_arch/src/x86_64/xsave.rs
@@ -8,17 +8,17 @@ use stdarch_test::assert_instr;
 #[allow(improper_ctypes)]
 extern "C" {
     #[link_name = "llvm.x86.xsave64"]
-    fn xsave64(p: *mut u8, hi: u32, lo: u32) -> ();
+    fn xsave64(p: *mut u8, hi: u32, lo: u32);
     #[link_name = "llvm.x86.xrstor64"]
-    fn xrstor64(p: *const u8, hi: u32, lo: u32) -> ();
+    fn xrstor64(p: *const u8, hi: u32, lo: u32);
     #[link_name = "llvm.x86.xsaveopt64"]
-    fn xsaveopt64(p: *mut u8, hi: u32, lo: u32) -> ();
+    fn xsaveopt64(p: *mut u8, hi: u32, lo: u32);
     #[link_name = "llvm.x86.xsavec64"]
-    fn xsavec64(p: *mut u8, hi: u32, lo: u32) -> ();
+    fn xsavec64(p: *mut u8, hi: u32, lo: u32);
     #[link_name = "llvm.x86.xsaves64"]
-    fn xsaves64(p: *mut u8, hi: u32, lo: u32) -> ();
+    fn xsaves64(p: *mut u8, hi: u32, lo: u32);
     #[link_name = "llvm.x86.xrstors64"]
-    fn xrstors64(p: *const u8, hi: u32, lo: u32) -> ();
+    fn xrstors64(p: *const u8, hi: u32, lo: u32);
 }
 
 /// Performs a full or partial save of the enabled processor states to memory at
diff --git a/crates/core_arch/tests/cpu-detection.rs b/crates/core_arch/tests/cpu-detection.rs
@@ -1,5 +1,5 @@
 #![feature(stdsimd)]
-#![allow(clippy::option_unwrap_used, clippy::print_stdout, clippy::use_debug)]
+#![allow(clippy::unwrap_used, clippy::print_stdout, clippy::use_debug)]
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 #[macro_use]
diff --git a/crates/std_detect/tests/cpu-detection.rs b/crates/std_detect/tests/cpu-detection.rs
@@ -1,5 +1,5 @@
 #![feature(stdsimd)]
-#![allow(clippy::option_unwrap_used, clippy::use_debug, clippy::print_stdout)]
+#![allow(clippy::unwrap_used, clippy::use_debug, clippy::print_stdout)]
 #![cfg(any(
     target_arch = "arm",
     target_arch = "aarch64",
diff --git a/crates/std_detect/tests/macro_trailing_commas.rs b/crates/std_detect/tests/macro_trailing_commas.rs
@@ -1,5 +1,5 @@
 #![feature(stdsimd)]
-#![allow(clippy::option_unwrap_used, clippy::use_debug, clippy::print_stdout)]
+#![allow(clippy::unwrap_used, clippy::use_debug, clippy::print_stdout)]
 
 #[cfg(any(
     target_arch = "arm",
diff --git a/crates/stdarch-gen/src/main.rs b/crates/stdarch-gen/src/main.rs
@@ -476,7 +476,7 @@ pub unsafe fn {}(a: {}, b: {}) -> {} {{
 }
 
 fn expand_intrinsic(intr: &str, t: &str) -> String {
-    if intr.ends_with(".") {
+    if intr.ends_with('.') {
         let ext = match t {
             "int8x8_t" => "i8",
             "int8x16_t" => "i8",
diff --git a/crates/stdarch-verify/src/lib.rs b/crates/stdarch-verify/src/lib.rs
@@ -336,7 +336,7 @@ fn find_instrs(attrs: &[syn::Attribute]) -> Vec<String> {
                 } else if let Ok(ident) = instrs.call(syn::Ident::parse_any) {
                     instr.push_str(&ident.to_string());
                 } else if instrs.parse::<Token![.]>().is_ok() {
-                    instr.push_str(".");
+                    instr.push('.');
                 } else if instrs.parse::<Token![,]>().is_ok() {
                     // consume everything remaining
                     drop(instrs.parse::<proc_macro2::TokenStream>());
diff --git a/crates/stdarch-verify/tests/arm.rs b/crates/stdarch-verify/tests/arm.rs
@@ -468,7 +468,7 @@ fn matches(rust: &Function, arm: &Intrinsic) -> Result<(), String> {
             }
             // sometimes arm says `foo` and disassemblers say `vfoo`, or
             // sometimes disassemblers say `vfoo` and arm says `sfoo` or `ffoo`
-            if instr.starts_with("v")
+            if instr.starts_with('v')
                 && (arm.instruction.starts_with(&instr[1..])
                     || arm.instruction[1..].starts_with(&instr[1..]))
             {
@@ -491,10 +491,10 @@ fn matches(rust: &Function, arm: &Intrinsic) -> Result<(), String> {
 fn find_accordion(node: &Rc<Node>) -> Option<Rc<Node>> {
     if let NodeData::Element { attrs, .. } = &node.data {
         for attr in attrs.borrow().iter() {
-            if attr.name.local.eq_str_ignore_ascii_case("class") {
-                if attr.value.to_string() == "intrinsic-accordion" {
-                    return Some(node.clone());
-                }
+            if attr.name.local.eq_str_ignore_ascii_case("class")
+                && attr.value.to_string() == "intrinsic-accordion"
+            {
+                return Some(node.clone());
             }
         }
     }
@@ -522,7 +522,7 @@ fn parse_intrinsics(node: &Rc<Node>) -> HashMap<String, Intrinsic> {
             ret.insert(f.name.clone(), f);
         }
     }
-    return ret;
+    ret
 }
 
 fn parse_intrinsic(node: &Rc<Node>) -> Intrinsic {
@@ -535,10 +535,9 @@ fn parse_intrinsic(node: &Rc<Node>) -> Intrinsic {
     //    ...
 
     let children = node.children.borrow();
-    let mut children = children.iter().filter(|node| match node.data {
-        NodeData::Element { .. } => true,
-        _ => false,
-    });
+    let mut children = children
+        .iter()
+        .filter(|node| matches!(node.data, NodeData::Element { .. }));
     let _input = children.next().expect("no <input>");
     let label = children.next().expect("no <label>");
     let article = children.next().expect("no <article>");
@@ -558,10 +557,9 @@ fn parse_intrinsic(node: &Rc<Node>) -> Intrinsic {
 
     // Find contents of inner `<div>` in `<label>`
     let label_children = label.children.borrow();
-    let mut label_children = label_children.iter().filter(|node| match node.data {
-        NodeData::Element { .. } => true,
-        _ => false,
-    });
+    let mut label_children = label_children
+        .iter()
+        .filter(|node| matches!(node.data, NodeData::Element { .. }));
     let label_div = label_children.next().expect("no <div> in <label>");
     assert!(label_children.next().is_none());
     let text = label_div.children.borrow();
@@ -577,10 +575,9 @@ fn parse_intrinsic(node: &Rc<Node>) -> Intrinsic {
 
     // Find the instruction within the article
     let article_children = article.children.borrow();
-    let mut article_children = article_children.iter().filter(|node| match node.data {
-        NodeData::Element { .. } => true,
-        _ => false,
-    });
+    let mut article_children = article_children
+        .iter()
+        .filter(|node| matches!(node.data, NodeData::Element { .. }));
     let mut instruction = None;
     while let Some(child) = article_children.next() {
         let mut header = String::new();
@@ -609,9 +606,9 @@ fn parse_intrinsic(node: &Rc<Node>) -> Intrinsic {
         },
         instruction,
         arguments: args // "(...)"
-            .trim_start_matches("(") // "...)"
-            .trim_end_matches(")") // "..."
-            .split(",") // " Type name ", ".."
+            .trim_start_matches('(') // "...)"
+            .trim_end_matches(')') // "..."
+            .split(',') // " Type name ", ".."
             .map(|s| s.trim()) // "Type name"
             .map(|s| s.rsplitn(2, ' ').nth(1).unwrap()) // "Type"
             .map(|s| {
@@ -775,7 +772,7 @@ fn parse_ty_base(s: &str) -> &'static Type {
 
 fn collect_text(s: &mut String, node: &Node) {
     if let NodeData::Text { contents } = &node.data {
-        s.push_str(" ");
+        s.push(' ');
         s.push_str(&contents.borrow().to_string());
     }
     for child in node.children.borrow().iter() {
diff --git a/crates/stdarch-verify/tests/mips.rs b/crates/stdarch-verify/tests/mips.rs
@@ -193,8 +193,8 @@ fn verify_all_signatures() {
         }
 
         use std::convert::TryFrom;
-        let intrinsic: MsaIntrinsic =
-            TryFrom::try_from(line).expect(&format!("failed to parse line: \"{}\"", line));
+        let intrinsic: MsaIntrinsic = TryFrom::try_from(line)
+            .unwrap_or_else(|_| panic!("failed to parse line: \"{}\"", line));
         assert!(!intrinsics.contains_key(&intrinsic.id));
         intrinsics.insert(intrinsic.id.clone(), intrinsic);
     }
@@ -293,10 +293,7 @@ fn matches(rust: &Function, mips: &MsaIntrinsic) -> Result<(), String> {
             | MsaTy::imm_n1024_1022
             | MsaTy::imm_n2048_2044
             | MsaTy::imm_n4096_4088
-                if **rust_arg == I32 =>
-            {
-                ()
-            }
+                if **rust_arg == I32 => {}
             MsaTy::i32 if **rust_arg == I32 => (),
             MsaTy::i64 if **rust_arg == I64 => (),
             MsaTy::u32 if **rust_arg == U32 => (),
@@ -310,21 +307,21 @@ fn matches(rust: &Function, mips: &MsaIntrinsic) -> Result<(), String> {
             ),
         }
 
-        let is_const = match mips_arg {
+        let is_const = matches!(
+            mips_arg,
             MsaTy::imm0_1
-            | MsaTy::imm0_3
-            | MsaTy::imm0_7
-            | MsaTy::imm0_15
-            | MsaTy::imm0_31
-            | MsaTy::imm0_63
-            | MsaTy::imm0_255
-            | MsaTy::imm_n16_15
-            | MsaTy::imm_n512_511
-            | MsaTy::imm_n1024_1022
-            | MsaTy::imm_n2048_2044
-            | MsaTy::imm_n4096_4088 => true,
-            _ => false,
-        };
+                | MsaTy::imm0_3
+                | MsaTy::imm0_7
+                | MsaTy::imm0_15
+                | MsaTy::imm0_31
+                | MsaTy::imm0_63
+                | MsaTy::imm0_255
+                | MsaTy::imm_n16_15
+                | MsaTy::imm_n512_511
+                | MsaTy::imm_n1024_1022
+                | MsaTy::imm_n2048_2044
+                | MsaTy::imm_n4096_4088
+        );
         if is_const {
             nconst += 1;
             if !rust.required_const.contains(&i) {
diff --git a/crates/stdarch-verify/tests/x86-intel.rs b/crates/stdarch-verify/tests/x86-intel.rs
diff --git a/examples/hex.rs b/examples/hex.rs

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ fn main() {`
`6`	`6`	`.ok()`
`7`	`7`	`.and_then(\|s\| s.parse().ok())`
`8`	`8`	`.unwrap_or(0);`
`9`		`- let profile = env::var("PROFILE").unwrap_or(String::new());`
	`9`	`+ let profile = env::var("PROFILE").unwrap_or_default();`
`10`	`10`	`if profile == "release" \|\| opt_level >= 2 {`
`11`	`11`	`println!("cargo:rustc-cfg=optimized");`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ impl syn::parse::Parse for Invoc {`
`179`	`179`	`continue;`
`180`	`180`	`}`
`181`	`181`	`if input.parse::<Token![.]>().is_ok() {`
`182`		`- instr.push_str(".");`
	`182`	`+ instr.push('.');`
`183`	`183`	`continue;`
`184`	`184`	`}`
`185`	`185`	`if let Ok(s) = input.parse::<syn::LitStr>() {`