Fix various build warnings.

components/canvas/lib.rs

@@ -5,6 +5,7 @@
 #![deny(unused_imports)]
 #![deny(unused_variables)]
 #![allow(missing_copy_implementations)]
+#![allow(unstable)]
 
 extern crate azure;
 extern crate geom;

components/devtools_traits/lib.rs

@@ -13,6 +13,7 @@
 
 #![allow(non_snake_case)]
 #![allow(missing_copy_implementations)]
+#![allow(unstable)]
 
 extern crate "msg" as servo_msg;
 extern crate serialize;

components/layout/layout_debug.rs

@@ -5,7 +5,7 @@
 //! Supports writing a trace file created during each layout scope
 //! that can be viewed by an external tool to make layout debugging easier.
 
-#![macro_escape]
+#![macro_use]
 
 use flow_ref::FlowRef;
 use flow;

components/msg/lib.rs

@@ -7,6 +7,7 @@
 #![deny(unused_imports)]
 #![deny(unused_variables)]
 #![allow(missing_copy_implementations)]
+#![allow(unstable)]
 
 extern crate azure;
 extern crate geom;

components/script/lib.rs

@@ -49,9 +49,9 @@ extern crate string_cache_macros;
 pub mod cors;
 
 /// The implementation of the DOM.
-#[macro_escape]
+#[macro_use]
 pub mod dom {
-    #[macro_escape]
+    #[macro_use]
     pub mod macros;
 
     /// The code to expose the DOM to JavaScript through IDL bindings.

components/script_traits/lib.rs

@@ -7,6 +7,7 @@
 #![deny(unused_imports)]
 #![deny(unused_variables)]
 #![allow(missing_copy_implementations)]
+#![allow(unstable)]
 
 extern crate devtools_traits;
 extern crate geom;

components/servo/lib.rs

@@ -7,6 +7,7 @@
 #![deny(unused_imports)]
 #![deny(unused_variables)]
 #![allow(missing_copy_implementations)]
+#![allow(unstable)]
 
 #[macro_use]
 extern crate log;

components/servo/main.rs

@@ -4,6 +4,7 @@
 
 #![deny(unused_imports)]
 #![deny(unused_variables)]
+#![allow(unstable)]
 
 #[cfg(target_os="android")]
 extern crate libc;

components/util/workqueue.rs

@@ -195,7 +195,7 @@ impl<'a, QueueData: 'static, WorkData: Send> WorkerProxy<'a, QueueData, WorkData
 
     /// Retrieves the queue user data.
     #[inline]
-    pub fn user_data<'a>(&'a self) -> &'a QueueData {
+    pub fn user_data<'b>(&'b self) -> &'b QueueData {
         unsafe {
             mem::transmute(self.queue_data)
         }

ports/cef/browser_host.rs

@@ -6,13 +6,13 @@ use eutil::Downcast;
 use interfaces::{CefBrowser, CefBrowserHost, CefClient, cef_browser_host_t, cef_client_t};
 use types::{cef_mouse_button_type_t, cef_mouse_event, cef_rect_t, cef_key_event};
 use types::cef_key_event_type_t::{KEYEVENT_CHAR, KEYEVENT_KEYDOWN, KEYEVENT_KEYUP, KEYEVENT_RAWKEYDOWN};
-use browser::{mod, ServoCefBrowserExtensions};
+use browser::{self, ServoCefBrowserExtensions};
 
 use compositing::windowing::{WindowEvent, MouseWindowEvent};
 use geom::point::TypedPoint2D;
 use geom::size::TypedSize2D;
 use libc::{c_double, c_int};
-use servo_msg::constellation_msg::{mod, KeyModifiers, KeyState};
+use servo_msg::constellation_msg::{self, KeyModifiers, KeyState};
 use std::cell::RefCell;
 
 pub struct ServoCefBrowserHost {

ports/cef/eutil.rs

@@ -4,7 +4,7 @@
 
 use types::cef_base_t;
 
-use libc::{mod, c_int, c_void, size_t};
+use libc::{self, c_int, c_void, size_t};
 use std::mem;
 use std::slice;
 use std::str;

ports/cef/macros.rs

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![macro_escape]
+#![macro_use]
 
 // Provides the implementation of a CEF class. An example follows:
 //

ports/cef/string.rs

@@ -4,7 +4,7 @@
 
 
 use eutil::slice_to_str;
-use libc::{mod, size_t, c_int, c_ushort, c_void};
+use libc::{self, size_t, c_int, c_ushort, c_void};
 use libc::types::os::arch::c95::wchar_t;
 use std::char;
 use std::cmp::Ordering;

ports/cef/v8.rs

@@ -6,7 +6,7 @@ use interfaces::{cef_v8accessor_t, cef_v8context_t, cef_v8handler_t, cef_v8stack
 use interfaces::{cef_v8value_t};
 use types::{cef_string_t, cef_time_t};
 
-use libc::{mod, c_double, c_int};
+use libc::{self, c_double, c_int};
 
 cef_stub_static_method_impls! {
     fn cef_v8context_get_current_context() -> *mut cef_v8context_t

ports/cef/window.rs

@@ -13,7 +13,7 @@ use render_handler::CefRenderHandlerExtensions;
 use types::{cef_cursor_handle_t, cef_rect_t};
 use wrappers::Utf16Encoder;
 
-use compositing::compositor_task::{mod, CompositorProxy, CompositorReceiver};
+use compositing::compositor_task::{self, CompositorProxy, CompositorReceiver};
 use compositing::windowing::{WindowEvent, WindowMethods};
 use geom::scale_factor::ScaleFactor;
 use geom::size::TypedSize2D;

ports/cef/wrappers.rs

@@ -30,7 +30,7 @@ use types::{cef_time_t, cef_transition_type_t, cef_urlrequest_status_t};
 use types::{cef_v8_accesscontrol_t, cef_v8_propertyattribute_t, cef_value_type_t};
 use types::{cef_window_info_t, cef_xml_encoding_type_t, cef_xml_node_type_t};
 
-use libc::{mod, c_char, c_int, c_ushort, c_void};
+use libc::{self, c_char, c_int, c_ushort, c_void};
 use std::collections::HashMap;
 use std::mem;
 use std::ptr;

ports/glfw/window.rs

@@ -6,13 +6,13 @@
 
 use NestedEventLoopListener;
 
-use compositing::compositor_task::{mod, CompositorProxy, CompositorReceiver};
+use compositing::compositor_task::{self, CompositorProxy, CompositorReceiver};
 use compositing::windowing::WindowNavigateMsg;
 use compositing::windowing::{MouseWindowEvent, WindowEvent, WindowMethods};
 use geom::point::{Point2D, TypedPoint2D};
 use geom::scale_factor::ScaleFactor;
 use geom::size::TypedSize2D;
-use glfw::{mod, Context};
+use glfw::{self, Context};
 use gleam::gl;
 use layers::geometry::DevicePixel;
 use layers::platform::surface::NativeGraphicsMetadata;
@@ -25,7 +25,7 @@ use std::cell::{Cell, RefCell};
 use std::comm::Receiver;
 use std::num::Float;
 use std::rc::Rc;
-use time::{mod, Timespec};
+use time::{self, Timespec};
 use util::cursor::Cursor;
 use util::geometry::ScreenPx;
 

ports/glutin/lib.rs

@@ -6,6 +6,7 @@
 
 #![feature(box_syntax, int_uint)]
 #![deny(unused_imports, unused_variables)]
+#![allow(unstable)]
 
 #[cfg(target_os="macos")]
 extern crate cgl;

ports/glutin/window.rs

@@ -4,7 +4,7 @@
 
 //! A windowing implementation using glutin.
 
-use compositing::compositor_task::{mod, CompositorProxy, CompositorReceiver};
+use compositing::compositor_task::{self, CompositorProxy, CompositorReceiver};
 use compositing::windowing::{WindowEvent, WindowMethods};
 use geom::scale_factor::ScaleFactor;
 use geom::size::TypedSize2D;
@@ -35,7 +35,7 @@ use std::cell::{Cell, RefCell};
 #[cfg(feature = "window")]
 use std::num::Float;
 #[cfg(feature = "window")]
-use time::{mod, Timespec};
+use time::{self, Timespec};
 #[cfg(feature = "window")]
 use util::opts;
 

ports/gonk/src/window.rs

@@ -4,7 +4,7 @@
 
 //! A windowing implementation using gonk interfaces.
 
-use compositing::compositor_task::{mod, CompositorProxy, CompositorReceiver};
+use compositing::compositor_task::{self, CompositorProxy, CompositorReceiver};
 use compositing::windowing::{WindowEvent, WindowMethods};
 use geom::scale_factor::ScaleFactor;
 use geom::size::TypedSize2D;