Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-21 22:33:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

update rust toolchain

Browse source
This commit is contained in:
Kunal Mohan 2020-05-21 21:51:49 +05:30
parent a4f911699a
commit f3fa53b849
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/canvas/canvas_data.rs
View file

@ -455,7 +455,7 @@ impl<'a> CanvasData<'a> {
pub fn restore_context_state(&mut self) { pub fn restore_context_state(&mut self) {
if let Some(state) = self.saved_states.pop() { 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.set_transform(&self.state.transform);
self.drawtarget.pop_clip(); self.drawtarget.pop_clip();
} }

2
components/script/dom/response.rs
View file

@ -239,7 +239,7 @@ impl BodyOperations for Response {
match body { match body {
NetTraitsResponseBody::Done(bytes) => Some(bytes), NetTraitsResponseBody::Done(bytes) => Some(bytes),
body => { body => {
mem::replace(&mut *self.body.borrow_mut(), body); let _ = mem::replace(&mut *self.body.borrow_mut(), body);
None None
}, },
} }

4
components/style/values/generics/calc.rs
View file

@ -337,7 +337,7 @@ impl<L: CalcNodeLeaf> CalcNode<L> {
($slot:expr) => {{ ($slot:expr) => {{
let dummy = Self::MinMax(Default::default(), MinMaxOp::Max); let dummy = Self::MinMax(Default::default(), MinMaxOp::Max);
let result = mem::replace($slot, dummy); let result = mem::replace($slot, dummy);
mem::replace(self, result); let _ = mem::replace(self, result);
}}; }};
} }
match *self { match *self {
@ -464,7 +464,7 @@ impl<L: CalcNodeLeaf> CalcNode<L> {
replace_self_with!(&mut children[0]); replace_self_with!(&mut children[0]);
} else { } else {
// Else put our simplified children back. // 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) => { Self::Leaf(ref mut l) => {

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2020-04-08 nightly-2020-05-15