Skip to content

Commit

Permalink
update rust toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
kunalmohan committed May 21, 2020
1 parent a4f9116 commit f3fa53b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion components/canvas/canvas_data.rs
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion components/script/dom/response.rs
Expand Up @@ -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
},
}
Expand Down
4 changes: 2 additions & 2 deletions components/style/values/generics/calc.rs
Expand Up @@ -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 {
Expand Down Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
@@ -1 +1 @@
nightly-2020-04-08
nightly-2020-05-15

0 comments on commit f3fa53b

Please sign in to comment.