Fix clippy failure on Rust 1.42.0

coolreader18 · coolreader18 · commit 3d07a73346a4 · 2020-03-12T17:42:37.000-05:00
diff --git a/parser/src/lib.rs b/parser/src/lib.rs
@@ -32,6 +32,7 @@ pub mod mode;
 pub mod parser;
 lalrpop_mod!(
     #[allow(clippy::all)]
+    #[allow(unused)]
     python
 );
 pub mod token;
diff --git a/vm/src/function.rs b/vm/src/function.rs
@@ -67,7 +67,7 @@ impl From<(&Args, &KwArgs)> for PyFuncArgs {
 
 impl FromArgs for PyFuncArgs {
     fn from_args(_vm: &VirtualMachine, args: &mut PyFuncArgs) -> Result<Self, ArgumentError> {
-        Ok(mem::replace(args, Default::default()))
+        Ok(mem::take(args))
     }
 }
 
diff --git a/vm/src/stdlib/itertools.rs b/vm/src/stdlib/itertools.rs
@@ -906,8 +906,8 @@ impl PyItertoolsProduct {
     }
 
     fn is_end(&self) -> bool {
-        (self.idxs.borrow()[self.cur.get()] == &self.pools[self.cur.get()].len() - 1
-            && self.cur.get() == 0)
+        let cur = self.cur.get();
+        self.idxs.borrow()[cur] == self.pools[cur].len() - 1 && cur == 0
     }
 
     fn update_idxs(&self) {

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ impl From<(&Args, &KwArgs)> for PyFuncArgs {`
`67`	`67`
`68`	`68`	`impl FromArgs for PyFuncArgs {`
`69`	`69`	`fn from_args(_vm: &VirtualMachine, args: &mut PyFuncArgs) -> Result<Self, ArgumentError> {`
`70`		`- Ok(mem::replace(args, Default::default()))`
	`70`	`+ Ok(mem::take(args))`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -906,8 +906,8 @@ impl PyItertoolsProduct {`
`906`	`906`	`}`
`907`	`907`
`908`	`908`	`fn is_end(&self) -> bool {`
`909`		`- (self.idxs.borrow()[self.cur.get()] == &self.pools[self.cur.get()].len() - 1`
`910`		`- && self.cur.get() == 0)`
	`909`	`+ let cur = self.cur.get();`
	`910`	`+ self.idxs.borrow()[cur] == self.pools[cur].len() - 1 && cur == 0`
`911`	`911`	`}`
`912`	`912`
`913`	`913`	`fn update_idxs(&self) {`