From f3fa53b8497f18f80d46f90057993b190e57dce8 Mon Sep 17 00:00:00 2001 From: Kunal Mohan Date: Thu, 21 May 2020 21:51:49 +0530 Subject: [PATCH] update rust toolchain --- components/canvas/canvas_data.rs | 2 +- components/script/dom/response.rs | 2 +- components/style/values/generics/calc.rs | 4 ++-- 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 4a7959788fba..9c3aae1d0beb 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 d04cde07755f..63c08b3eac8e 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 074dd97f4d0b..dd77fd285527 100644 --- a/components/style/values/generics/calc.rs +++ b/components/style/values/generics/calc.rs @@ -337,7 +337,7 @@ impl CalcNode { ($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 CalcNode { 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 0bddeb45c82d..8737a7eb567a 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2020-04-08 +nightly-2020-05-15