diff options
-rw-r--r-- | components/canvas/canvas_data.rs | 2 | ||||
-rw-r--r-- | components/script/dom/response.rs | 2 | ||||
-rw-r--r-- | components/style/values/generics/calc.rs | 4 | ||||
-rw-r--r-- | rust-toolchain | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs index 4a7959788fb..9c3aae1d0be 100644 --- a/components/canvas/canvas_data.rs +++ b/components/canvas/canvas_data.rs @@ -455,7 +455,7 @@ impl<'a> CanvasData<'a> { pub fn restore_context_state(&mut self) { if let Some(state) = self.saved_states.pop() { - mem::replace(&mut self.state, state); + let _ = mem::replace(&mut self.state, state); self.drawtarget.set_transform(&self.state.transform); self.drawtarget.pop_clip(); } diff --git a/components/script/dom/response.rs b/components/script/dom/response.rs index d04cde07755..63c08b3eac8 100644 --- a/components/script/dom/response.rs +++ b/components/script/dom/response.rs @@ -239,7 +239,7 @@ impl BodyOperations for Response { match body { NetTraitsResponseBody::Done(bytes) => Some(bytes), body => { - mem::replace(&mut *self.body.borrow_mut(), body); + let _ = mem::replace(&mut *self.body.borrow_mut(), body); None }, } diff --git a/components/style/values/generics/calc.rs b/components/style/values/generics/calc.rs index 074dd97f4d0..dd77fd28552 100644 --- a/components/style/values/generics/calc.rs +++ b/components/style/values/generics/calc.rs @@ -337,7 +337,7 @@ impl<L: CalcNodeLeaf> CalcNode<L> { ($slot:expr) => {{ let dummy = Self::MinMax(Default::default(), MinMaxOp::Max); let result = mem::replace($slot, dummy); - mem::replace(self, result); + let _ = mem::replace(self, result); }}; } match *self { @@ -464,7 +464,7 @@ impl<L: CalcNodeLeaf> CalcNode<L> { replace_self_with!(&mut children[0]); } else { // Else put our simplified children back. - mem::replace(children_slot, children.into_boxed_slice().into()); + let _ = mem::replace(children_slot, children.into_boxed_slice().into()); } }, Self::Leaf(ref mut l) => { diff --git a/rust-toolchain b/rust-toolchain index 0bddeb45c82..8737a7eb567 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2020-04-08 +nightly-2020-05-15 |