Merge pull request #3817 from youknowone/fix-clippy

youknowone · web-flow · commit 174c0267276f · 2022-06-25T02:12:18.000+09:00
Fix nightly clippy warnings
diff --git a/Lib/test/test_strtod.py b/Lib/test/test_strtod.py
@@ -219,9 +219,8 @@ def test_bigcomp(self):
                 s = '{}e{}'.format(digits, exponent)
                 self.check_strtod(s)
 
-    @unittest.skipIf(sys.platform == "win32", "TODO: RUSTPYTHON, possibly flaky test on Windows?")
     # TODO: RUSTPYTHON, Incorrectly rounded str->float conversion for -07e-321
-    @unittest.expectedFailure
+    @unittest.skip("TODO: RUSTPYTHON; flaky test")
     def test_parsing(self):
         # make '0' more likely to be chosen than other digits
         digits = '000000123456789'
diff --git a/ast/src/constant.rs b/ast/src/constant.rs
@@ -71,7 +71,7 @@ impl std::fmt::Display for Constant {
 }
 
 /// Transforms a value prior to formatting it.
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 #[repr(u8)]
 pub enum ConversionFlag {
     /// Converts by calling `str(<value>)`.
diff --git a/ast/src/location.rs b/ast/src/location.rs
@@ -3,7 +3,7 @@
 use std::fmt;
 
 /// A location somewhere in the sourcecode.
-#[derive(Clone, Copy, Debug, Default, PartialEq)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 pub struct Location {
     row: usize,
     column: usize,
diff --git a/bytecode/src/lib.rs b/bytecode/src/lib.rs
@@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize};
 use std::{collections::BTreeSet, fmt, hash};
 
 /// Sourcecode location.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Location {
     row: u32,
     column: u32,
@@ -158,7 +158,7 @@ impl fmt::Display for Label {
 }
 
 /// Transforms a value prior to formatting it.
-#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum ConversionFlag {
     /// No conversion
     None,
@@ -171,7 +171,7 @@ pub enum ConversionFlag {
 }
 
 /// The kind of Raise that occurred.
-#[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum RaiseKind {
     Reraise,
     Raise,
@@ -181,7 +181,7 @@ pub enum RaiseKind {
 pub type NameIdx = u32;
 
 /// A Single bytecode instruction.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Instruction {
     /// Importing by name
     ImportName {
@@ -582,7 +582,7 @@ pub enum TestOperator {
 /// use rustpython_bytecode::BinaryOperator::Add;
 /// let op = BinaryOperation {op: Add};
 /// ```
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum BinaryOperator {
     Power,
     Multiply,
@@ -600,7 +600,7 @@ pub enum BinaryOperator {
 }
 
 /// The possible unary operators
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum UnaryOperator {
     Not,
     Invert,
diff --git a/common/src/encodings.rs b/common/src/encodings.rs
@@ -73,7 +73,7 @@ where
     }
     // we need to coerce the lifetime to that of the function body rather than the
     // anonymous input lifetime, so that we can assign it data borrowed from data_from_err
-    let mut data = &*data;
+    let mut data = data;
     let mut data_from_err: E::BytesBuf;
     let mut out = String::with_capacity(data.len());
     let mut remaining_index = 0;
diff --git a/compiler/src/symboltable.rs b/compiler/src/symboltable.rs
@@ -62,7 +62,7 @@ impl SymbolTable {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum SymbolTableType {
     Module,
     Class,
@@ -83,7 +83,7 @@ impl fmt::Display for SymbolTableType {
 
 /// Indicator for a single symbol what the scope of this symbol is.
 /// The scope can be unknown, which is unfortunate, but not impossible.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum SymbolScope {
     Unknown,
     Local,
diff --git a/jit/src/lib.rs b/jit/src/lib.rs
@@ -163,7 +163,7 @@ impl JitSig {
     }
 }
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 #[non_exhaustive]
 pub enum JitType {
     Int,
diff --git a/vm/src/builtins/mappingproxy.rs b/vm/src/builtins/mappingproxy.rs
@@ -91,7 +91,7 @@ impl PyMappingProxy {
             MappingProxyInner::Class(class) => Ok(key
                 .as_interned_str(vm)
                 .map_or(false, |key| class.attributes.read().contains_key(key))),
-            MappingProxyInner::Mapping(mapping) => PySequence::contains(&*mapping, key, vm),
+            MappingProxyInner::Mapping(mapping) => PySequence::contains(mapping, key, vm),
         }
     }
 
diff --git a/vm/src/builtins/str.rs b/vm/src/builtins/str.rs
@@ -1611,7 +1611,7 @@ mod tests {
 impl<'s> AnyStrWrapper<'s> for PyStrRef {
     type Str = str;
     fn as_ref(&self) -> &str {
-        &*self.as_str()
+        self.as_str()
     }
 }
 
diff --git a/vm/src/function/number.rs b/vm/src/function/number.rs
@@ -95,7 +95,7 @@ impl TryFromObject for ArgIntoFloat {
 /// By default an object is considered true unless its class defines either a
 /// `__bool__()` method that returns False or a `__len__()` method that returns
 /// zero, when called with the object.
-#[derive(Debug, Default, PartialEq)]
+#[derive(Debug, Default, PartialEq, Eq)]
 pub struct ArgIntoBool {
     value: bool,
 }
diff --git a/vm/src/readline.rs b/vm/src/readline.rs
@@ -47,7 +47,8 @@ mod basic_readline {
                 return ReadlineResult::Io(e);
             }
 
-            match io::stdin().lock().lines().next() {
+            let next_line = io::stdin().lock().lines().next();
+            match next_line {
                 Some(Ok(line)) => ReadlineResult::Line(line),
                 None => ReadlineResult::Eof,
                 Some(Err(e)) => match e.kind() {
diff --git a/vm/src/stdlib/itertools.rs b/vm/src/stdlib/itertools.rs
@@ -767,10 +767,10 @@ mod decl {
             }
         }
         // We don't have an int or value was < 0 or > sys.maxsize
-        return Err(vm.new_value_error(format!(
+        Err(vm.new_value_error(format!(
             "{} argument for islice() must be None or an integer: 0 <= x <= sys.maxsize.",
             name
-        )));
+        )))
     }
 
     #[pyimpl(with(IterNext))]

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ impl std::fmt::Display for Constant {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/// Transforms a value prior to formatting it.`
`74`		`-#[derive(Copy, Clone, Debug, PartialEq)]`
	`74`	`+#[derive(Copy, Clone, Debug, PartialEq, Eq)]`
`75`	`75`	`#[repr(u8)]`
`76`	`76`	`pub enum ConversionFlag {`
`77`	`77`	/// Converts by calling `str(<value>)`.
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ where`
`73`	`73`	`}`
`74`	`74`	`// we need to coerce the lifetime to that of the function body rather than the`
`75`	`75`	`// anonymous input lifetime, so that we can assign it data borrowed from data_from_err`
`76`		`- let mut data = &*data;`
	`76`	`+ let mut data = data;`
`77`	`77`	`let mut data_from_err: E::BytesBuf;`
`78`	`78`	`let mut out = String::with_capacity(data.len());`
`79`	`79`	`let mut remaining_index = 0;`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ impl JitSig {`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
`166`		`-#[derive(Debug, Clone, PartialEq)]`
	`166`	`+#[derive(Debug, Clone, PartialEq, Eq)]`
`167`	`167`	`#[non_exhaustive]`
`168`	`168`	`pub enum JitType {`
`169`	`169`	`Int,`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ impl PyMappingProxy {`
`91`	`91`	`MappingProxyInner::Class(class) => Ok(key`
`92`	`92`	`.as_interned_str(vm)`
`93`	`93`	`.map_or(false, \|key\| class.attributes.read().contains_key(key))),`
`94`		`- MappingProxyInner::Mapping(mapping) => PySequence::contains(&*mapping, key, vm),`
	`94`	`+ MappingProxyInner::Mapping(mapping) => PySequence::contains(mapping, key, vm),`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -1611,7 +1611,7 @@ mod tests {`
`1611`	`1611`	`impl<'s> AnyStrWrapper<'s> for PyStrRef {`
`1612`	`1612`	`type Str = str;`
`1613`	`1613`	`fn as_ref(&self) -> &str {`
`1614`		`- &*self.as_str()`
	`1614`	`+ self.as_str()`
`1615`	`1615`	`}`
`1616`	`1616`	`}`
`1617`	`1617`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ impl TryFromObject for ArgIntoFloat {`
`95`	`95`	`/// By default an object is considered true unless its class defines either a`
`96`	`96`	/// `__bool__()` method that returns False or a `__len__()` method that returns
`97`	`97`	`/// zero, when called with the object.`
`98`		`-#[derive(Debug, Default, PartialEq)]`
	`98`	`+#[derive(Debug, Default, PartialEq, Eq)]`
`99`	`99`	`pub struct ArgIntoBool {`
`100`	`100`	`value: bool,`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ mod basic_readline {`
`47`	`47`	`return ReadlineResult::Io(e);`
`48`	`48`	`}`
`49`	`49`
`50`		`- match io::stdin().lock().lines().next() {`
	`50`	`+ let next_line = io::stdin().lock().lines().next();`
	`51`	`+ match next_line {`
`51`	`52`	`Some(Ok(line)) => ReadlineResult::Line(line),`
`52`	`53`	`None => ReadlineResult::Eof,`
`53`	`54`	`Some(Err(e)) => match e.kind() {`
Original file line number	Diff line number	Diff line change
`@@ -767,10 +767,10 @@ mod decl {`
`767`	`767`	`}`
`768`	`768`	`}`
`769`	`769`	`// We don't have an int or value was < 0 or > sys.maxsize`
`770`		`- return Err(vm.new_value_error(format!(`
	`770`	`+ Err(vm.new_value_error(format!(`
`771`	`771`	`"{} argument for islice() must be None or an integer: 0 <= x <= sys.maxsize.",`
`772`	`772`	`name`
`773`		`- )));`
	`773`	`+ )))`
`774`	`774`	`}`
`775`	`775`
`776`	`776`	`#[pyimpl(with(IterNext))]`