Auto merge of #6208 - Ms2ger:warning, r=larsbergstrom

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6208)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-28 12:45:13 -05:00
commit 952e953237

View file

@ -15,7 +15,6 @@ use layers::platform::surface::NativeGraphicsMetadata;
use msg::constellation_msg;
use msg::constellation_msg::Key;
use net::net_error_list::NetError;
use std::mem;
use std::rc::Rc;
use std::sync::mpsc::{channel, Sender};
use url::Url;
@ -311,6 +310,8 @@ impl Window {
}
pub fn wait_events(&self) -> Vec<WindowEvent> {
use std::mem;
let mut events = mem::replace(&mut *self.event_queue.borrow_mut(), Vec::new());
let mut close_event = false;