aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/canvas/lib.rs1
-rw-r--r--components/devtools_traits/lib.rs1
-rw-r--r--components/layout/layout_debug.rs2
-rw-r--r--components/msg/lib.rs1
-rw-r--r--components/script/lib.rs4
-rw-r--r--components/script_traits/lib.rs1
-rw-r--r--components/servo/lib.rs1
-rw-r--r--components/servo/main.rs1
-rw-r--r--components/util/workqueue.rs2
-rw-r--r--ports/cef/browser_host.rs4
-rw-r--r--ports/cef/eutil.rs2
-rw-r--r--ports/cef/macros.rs2
-rw-r--r--ports/cef/string.rs2
-rw-r--r--ports/cef/v8.rs2
-rw-r--r--ports/cef/window.rs2
-rw-r--r--ports/cef/wrappers.rs2
-rw-r--r--ports/glfw/window.rs6
-rw-r--r--ports/glutin/lib.rs1
-rw-r--r--ports/glutin/window.rs4
-rw-r--r--ports/gonk/src/window.rs2
20 files changed, 25 insertions, 18 deletions
diff --git a/components/canvas/lib.rs b/components/canvas/lib.rs
index 8280c530d8e..4992df4588f 100644
--- a/components/canvas/lib.rs
+++ b/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;
diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs
index 14c6c59b56c..7f3aa43ac4b 100644
--- a/components/devtools_traits/lib.rs
+++ b/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;
diff --git a/components/layout/layout_debug.rs b/components/layout/layout_debug.rs
index 5f0851b1f36..5fc606b8705 100644
--- a/components/layout/layout_debug.rs
+++ b/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;
diff --git a/components/msg/lib.rs b/components/msg/lib.rs
index ba02ce8babd..b22627fb4fd 100644
--- a/components/msg/lib.rs
+++ b/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;
diff --git a/components/script/lib.rs b/components/script/lib.rs
index aab99ec9106..055d658ddee 100644
--- a/components/script/lib.rs
+++ b/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.
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index 0b6bb4a3b36..1568615c619 100644
--- a/components/script_traits/lib.rs
+++ b/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;
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 3cc121da0ff..6f1d22ff0bd 100644
--- a/components/servo/lib.rs
+++ b/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;
diff --git a/components/servo/main.rs b/components/servo/main.rs
index 98463ee91a6..127143e26e8 100644
--- a/components/servo/main.rs
+++ b/components/servo/main.rs
@@ -4,6 +4,7 @@
#![deny(unused_imports)]
#![deny(unused_variables)]
+#![allow(unstable)]
#[cfg(target_os="android")]
extern crate libc;
diff --git a/components/util/workqueue.rs b/components/util/workqueue.rs
index c83902526fd..5cac6d71d70 100644
--- a/components/util/workqueue.rs
+++ b/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)
}
diff --git a/ports/cef/browser_host.rs b/ports/cef/browser_host.rs
index ed8e8f66ede..7b2d3f2c691 100644
--- a/ports/cef/browser_host.rs
+++ b/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 {
diff --git a/ports/cef/eutil.rs b/ports/cef/eutil.rs
index c46158430ec..9ba9852e051 100644
--- a/ports/cef/eutil.rs
+++ b/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;
diff --git a/ports/cef/macros.rs b/ports/cef/macros.rs
index dd31afe6573..97a42bcef17 100644
--- a/ports/cef/macros.rs
+++ b/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:
//
diff --git a/ports/cef/string.rs b/ports/cef/string.rs
index 8c59c60f4bf..efc35744434 100644
--- a/ports/cef/string.rs
+++ b/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;
diff --git a/ports/cef/v8.rs b/ports/cef/v8.rs
index 48b139ccda6..b046c7d1231 100644
--- a/ports/cef/v8.rs
+++ b/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
diff --git a/ports/cef/window.rs b/ports/cef/window.rs
index a4e4ebca08f..f557dfaaeef 100644
--- a/ports/cef/window.rs
+++ b/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;
diff --git a/ports/cef/wrappers.rs b/ports/cef/wrappers.rs
index caaacaba29a..cf3ebdd4b28 100644
--- a/ports/cef/wrappers.rs
+++ b/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;
diff --git a/ports/glfw/window.rs b/ports/glfw/window.rs
index 258bef206e4..d32c6c42fff 100644
--- a/ports/glfw/window.rs
+++ b/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;
diff --git a/ports/glutin/lib.rs b/ports/glutin/lib.rs
index d47a8fb22e5..08c83b61558 100644
--- a/ports/glutin/lib.rs
+++ b/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;
diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
index 80261c3c33b..747a9195572 100644
--- a/ports/glutin/window.rs
+++ b/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;
diff --git a/ports/gonk/src/window.rs b/ports/gonk/src/window.rs
index 361c05c47ef..49b04f919d3 100644
--- a/ports/gonk/src/window.rs
+++ b/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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 11:01:43 +0000