diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-04 15:09:00 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-04 15:09:00 +0530 |
| commit | bb117abcd3fee0c3435cefd3d4f196345770ca69 (patch) | |
| tree | 0ce41ef213d2ba5e1d9db9ee570c95c82990ee10 | |
| parent | 39a36a0098fd27230de1e1a3be835a7af589df2a (diff) | |
| parent | 208c05f944d5d40c1fb88351fbd6f8efc5c43ee4 (diff) | |
| download | servo-bb117abcd3fee0c3435cefd3d4f196345770ca69.tar.gz servo-bb117abcd3fee0c3435cefd3d4f196345770ca69.zip | |
Auto merge of #8820 - Ms2ger:warnings, r=SimonSapin
Fix warnings.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8820)
<!-- Reviewable:end -->
| -rw-r--r-- | components/compositing/constellation.rs | 4 | ||||
| -rw-r--r-- | components/gfx/display_list/mod.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/document.rs | 1 | ||||
| -rw-r--r-- | components/util/geometry.rs | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs index 34d20d42c0d..7013d9250de 100644 --- a/components/compositing/constellation.rs +++ b/components/compositing/constellation.rs @@ -617,13 +617,13 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> { pipeline_id, event_type, button, point)) => { if let Some(pipeline) = self.pipelines.get(&pipeline_id) { pipeline.script_chan.send(ConstellationControlMsg::SendEvent(pipeline_id, - CompositorEvent::MouseButtonEvent(event_type, button, point))); + CompositorEvent::MouseButtonEvent(event_type, button, point))).unwrap(); } } Request::Script(FromScriptMsg::ForwardMouseMoveEvent(pipeline_id, point)) => { if let Some(pipeline) = self.pipelines.get(&pipeline_id) { pipeline.script_chan.send(ConstellationControlMsg::SendEvent(pipeline_id, - CompositorEvent::MouseMoveEvent(Some(point)))); + CompositorEvent::MouseMoveEvent(Some(point)))).unwrap(); } } Request::Script(FromScriptMsg::GetClipboardContents(sender)) => { diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index 65424605e9c..88f70c9773e 100644 --- a/components/gfx/display_list/mod.rs +++ b/components/gfx/display_list/mod.rs @@ -43,7 +43,7 @@ use style::properties::ComputedValues; use text::TextRun; use text::glyph::CharIndex; use util::cursor::Cursor; -use util::geometry::{self, MAX_RECT}; +use util::geometry::MAX_RECT; use util::linked_list::prepend_from; use util::mem::HeapSizeOf; use util::opts; diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 0e790188320..1b729e9e543 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -13,7 +13,6 @@ use dom::bindings::codegen::Bindings::EventBinding::EventMethods; use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::EventHandlerBinding::OnErrorEventHandlerNonNull; use dom::bindings::codegen::Bindings::EventTargetBinding::EventTargetMethods; -use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods; use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods; use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilter; use dom::bindings::codegen::Bindings::PerformanceBinding::PerformanceMethods; diff --git a/components/util/geometry.rs b/components/util/geometry.rs index dc84d90b202..4af85d703c9 100644 --- a/components/util/geometry.rs +++ b/components/util/geometry.rs @@ -7,7 +7,6 @@ use euclid::point::Point2D; use euclid::rect::Rect; use euclid::size::Size2D; use std::i32; -use std::ops::Add; // Units for use with euclid::length and euclid::scale_factor. |