From ece8791c26134d359c6a9466cf45214445b8a01a Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Mon, 17 Jun 2013 13:54:42 -0600
Subject: [PATCH] Warning police.

---
 src/components/gfx/display_list.rs                   |  1 -
 src/components/main/compositing/mod.rs               |  9 +++------
 src/components/main/layout/aux.rs                    | 12 ++++++------
 .../main/platform/common/glut_windowing.rs           |  5 +++--
 src/components/script/script_task.rs                 |  2 +-
 src/support/azure/rust-azure                         |  2 +-
 src/support/netsurfcss/libcss                        |  2 +-
 src/support/skia/skia                                |  2 +-
 8 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/components/gfx/display_list.rs b/src/components/gfx/display_list.rs
index 8a7d5135242..508bd32a013 100644
--- a/src/components/gfx/display_list.rs
+++ b/src/components/gfx/display_list.rs
@@ -24,7 +24,6 @@ use geom::{Point2D, Rect, Size2D};
 use servo_net::image::base::Image;
 use servo_util::range::Range;
 use std::arc::ARC;
-use std::arc;
 
 /// A list of rendering operations to be performed.
 pub struct DisplayList<E> {
diff --git a/src/components/main/compositing/mod.rs b/src/components/main/compositing/mod.rs
index ba32b706c41..7e6a83c373c 100644
--- a/src/components/main/compositing/mod.rs
+++ b/src/components/main/compositing/mod.rs
@@ -3,15 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use platform::{Application, Window};
+use script::dom::event::{Event, ClickEvent, MouseDownEvent, MouseUpEvent, ResizeEvent};
 use script::script_task::{LoadMsg, SendEventMsg};
+use script::layout_interface::{LayoutChan, RouteScriptMsg};
+use script::compositor_interface::{ReadyState, ScriptListener};
 use windowing::{ApplicationMethods, WindowMethods, WindowMouseEvent, WindowClickEvent};
 use windowing::{WindowMouseDownEvent, WindowMouseUpEvent};
-
-use script::dom::event::{Event, ClickEvent, MouseDownEvent, MouseUpEvent, ResizeEvent};
-use script::compositor_interface::{ReadyState, ScriptListener};
-use script::script_task::{ScriptChan, SendEventMsg};
-use script::layout_interface::{LayoutChan, RouteScriptMsg};
-
 use azure::azure_hl::{DataSourceSurface, DrawTarget, SourceSurfaceMethods, current_gl_context};
 use azure::azure::AzGLContext;
 use core::cell::Cell;
diff --git a/src/components/main/layout/aux.rs b/src/components/main/layout/aux.rs
index 59682ef20b7..11a878246ea 100644
--- a/src/components/main/layout/aux.rs
+++ b/src/components/main/layout/aux.rs
@@ -42,19 +42,19 @@ pub trait LayoutAuxMethods {
 impl LayoutAuxMethods for AbstractNode<LayoutView> {
     // FIXME (Rust #3080): These unsafe blocks are *not* unused!
     pub fn layout_data(self) -> @mut LayoutData {
-        unsafe {
+        /*unsafe {*/
             self.unsafe_layout_data()
-        }
+        /*}*/
     }
     pub fn has_layout_data(self) -> bool {
-        unsafe {
+        /*unsafe {*/
             self.unsafe_has_layout_data()
-        }
+        /*}*/
     }
     pub fn set_layout_data(self, data: @mut LayoutData) {
-        unsafe {
+        /*unsafe {*/
             self.unsafe_set_layout_data(data)
-        }
+        /*}*/
     }
 
     /// If none exists, creates empty layout data for the node (the reader-auxiliary
diff --git a/src/components/main/platform/common/glut_windowing.rs b/src/components/main/platform/common/glut_windowing.rs
index 50e67d6e541..d633bb55056 100644
--- a/src/components/main/platform/common/glut_windowing.rs
+++ b/src/components/main/platform/common/glut_windowing.rs
@@ -59,7 +59,8 @@ impl WindowMethods<Application> for Window {
     /// Creates a new window.
     pub fn new(_: &Application) -> @mut Window {
         // Create the GLUT window.
-        unsafe { glut::bindgen::glutInitWindowSize(800, 600); }
+        // FIXME (Rust #3080): These unsafe blocks are *not* unused!
+        /*unsafe { */glut::bindgen::glutInitWindowSize(800, 600);/* }*/
         let glut_window = glut::create_window(~"Servo");
 
         // Create our window object.
@@ -117,7 +118,7 @@ impl WindowMethods<Application> for Window {
                 window.handle_mouse(button, state, x, y);
             }
         }
-        do glut::mouse_wheel_func |wheel, direction, x, y| {
+        do glut::mouse_wheel_func |wheel, direction, _x, _y| {
             let delta = if HAVE_PRECISE_MOUSE_WHEEL {
                 (direction as f32) / 10000.0
             } else {
diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs
index 39ef337b2f1..6eddd9d6335 100644
--- a/src/components/script/script_task.rs
+++ b/src/components/script/script_task.rs
@@ -546,7 +546,7 @@ impl ScriptContext {
                 }
             }
 
-            ClickEvent(button, point) => {
+            ClickEvent(_button, point) => {
                 debug!("ClickEvent: clicked at %?", point);
                 let root = match self.root_frame {
                     Some(ref frame) => frame.document.root,
diff --git a/src/support/azure/rust-azure b/src/support/azure/rust-azure
index 04976e3fae0..b754fd3d16f 160000
--- a/src/support/azure/rust-azure
+++ b/src/support/azure/rust-azure
@@ -1 +1 @@
-Subproject commit 04976e3fae0ef0332036082ab8770fb1ad2c10ca
+Subproject commit b754fd3d16f6acc80ae2252a310f8c71070366c3
diff --git a/src/support/netsurfcss/libcss b/src/support/netsurfcss/libcss
index d722188de38..da248d3f5b3 160000
--- a/src/support/netsurfcss/libcss
+++ b/src/support/netsurfcss/libcss
@@ -1 +1 @@
-Subproject commit d722188de3876ed748382965eb4f300fc1b78bf8
+Subproject commit da248d3f5b3ed6d9e804c543563be8e34baf1673
diff --git a/src/support/skia/skia b/src/support/skia/skia
index 7415c2829e7..5c00e2b7f47 160000
--- a/src/support/skia/skia
+++ b/src/support/skia/skia
@@ -1 +1 @@
-Subproject commit 7415c2829e77812411a2ae9cf448c0e288035463
+Subproject commit 5c00e2b7f471e70a892aeae36b4c77b78227823f