Merge pull request #1423 from dralley/fix-complaints

coolreader18 · web-flow · commit 3856e9373d93 · 2019-09-26T20:35:53.000-05:00
Fix some clippy complaints
diff --git a/vm/src/obj/objbytes.rs b/vm/src/obj/objbytes.rs
@@ -509,8 +509,8 @@ impl PyBytesRef {
                                     }
                                 }
                                 None => {
-                                    if replacing_char.is_some() {
-                                        decode_content.push(replacing_char.unwrap())
+                                    if let Some(replacing_char) = replacing_char {
+                                        decode_content.push(replacing_char)
                                     }
                                 }
                             }
diff --git a/vm/src/stdlib/binascii.rs b/vm/src/stdlib/binascii.rs
@@ -45,8 +45,8 @@ fn binascii_unhexlify(hexstr: PyBytesRef, vm: &VirtualMachine) -> PyResult {
     for i in (0..hex_bytes.len()).step_by(2) {
         let n1 = unhex_nibble(hex_bytes[i]);
         let n2 = unhex_nibble(hex_bytes[i + 1]);
-        if n1.is_some() && n2.is_some() {
-            unhex.push(n1.unwrap() << 4 | n2.unwrap());
+        if let (Some(n1), Some(n2)) = (n1, n2) {
+            unhex.push(n1 << 4 | n2);
         } else {
             return Err(vm.new_value_error("Non-hexadecimal digit found".to_string()));
         }
diff --git a/vm/src/stdlib/hashlib.rs b/vm/src/stdlib/hashlib.rs
@@ -204,8 +204,7 @@ struct HashWrapper {
 impl HashWrapper {
     fn new<D: 'static>(d: D) -> Self
     where
-        D: DynDigest,
-        D: Sized,
+        D: DynDigest + Sized,
     {
         HashWrapper { inner: Box::new(d) }
     }
diff --git a/vm/src/stdlib/pystruct.rs b/vm/src/stdlib/pystruct.rs
@@ -56,8 +56,7 @@ fn parse_format_string(fmt: String) -> Result<FormatSpec, String> {
 /// See also: https://docs.python.org/3/library/struct.html?highlight=struct#byte-order-size-and-alignment
 fn parse_endiannes<I>(chars: &mut Peekable<I>) -> Endianness
 where
-    I: Sized,
-    I: Iterator<Item = char>,
+    I: Sized + Iterator<Item = char>,
 {
     match chars.peek() {
         Some('@') => {
@@ -86,8 +85,7 @@ where
 
 fn parse_format_codes<I>(chars: &mut Peekable<I>) -> Result<Vec<FormatCode>, String>
 where
-    I: Sized,
-    I: Iterator<Item = char>,
+    I: Sized + Iterator<Item = char>,
 {
     let mut codes = vec![];
     for c in chars {

Original file line number	Diff line number	Diff line change
`@@ -509,8 +509,8 @@ impl PyBytesRef {`
`509`	`509`	`}`
`510`	`510`	`}`
`511`	`511`	`None => {`
`512`		`- if replacing_char.is_some() {`
`513`		`- decode_content.push(replacing_char.unwrap())`
	`512`	`+ if let Some(replacing_char) = replacing_char {`
	`513`	`+ decode_content.push(replacing_char)`
`514`	`514`	`}`
`515`	`515`	`}`
`516`	`516`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,7 @@ struct HashWrapper {`
`204`	`204`	`impl HashWrapper {`
`205`	`205`	`fn new<D: 'static>(d: D) -> Self`
`206`	`206`	`where`
`207`		`- D: DynDigest,`
`208`		`- D: Sized,`
	`207`	`+ D: DynDigest + Sized,`
`209`	`208`	`{`
`210`	`209`	`HashWrapper { inner: Box::new(d) }`
`211`	`210`	`}`