diff options
| -rw-r--r-- | components/layout/layout_debug.rs | 5 | ||||
| -rw-r--r-- | components/net/lib.rs | 1 | ||||
| -rw-r--r-- | tests/reftest.rs | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/components/layout/layout_debug.rs b/components/layout/layout_debug.rs index 36a013161dc..e9e5c585e68 100644 --- a/components/layout/layout_debug.rs +++ b/components/layout/layout_debug.rs @@ -6,7 +6,6 @@ //! that can be viewed by an external tool to make layout debugging easier. #![macro_use] -#![allow(unsafe_code)] // thread_local!() defines an unsafe function on Android use flow_ref::FlowRef; use flow; @@ -20,7 +19,7 @@ use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT}; thread_local!(static STATE_KEY: RefCell<Option<State>> = RefCell::new(None)); -static mut DEBUG_ID_COUNTER: AtomicUsize = ATOMIC_USIZE_INIT; +static DEBUG_ID_COUNTER: AtomicUsize = ATOMIC_USIZE_INIT; pub struct Scope; @@ -98,7 +97,7 @@ impl Drop for Scope { /// which are often reallocated but represent essentially the /// same data. pub fn generate_unique_debug_id() -> u16 { - unsafe { DEBUG_ID_COUNTER.fetch_add(1, Ordering::SeqCst) as u16 } + DEBUG_ID_COUNTER.fetch_add(1, Ordering::SeqCst) as u16 } /// Begin a layout debug trace. If this has not been called, diff --git a/components/net/lib.rs b/components/net/lib.rs index 8379211b36f..d00f458b505 100644 --- a/components/net/lib.rs +++ b/components/net/lib.rs @@ -10,7 +10,6 @@ #![feature(plugin)] #![feature(rustc_private)] #![feature(std_misc)] -#![feature(unboxed_closures)] #![plugin(regex_macros)] diff --git a/tests/reftest.rs b/tests/reftest.rs index 43f187cb684..d7932a783bd 100644 --- a/tests/reftest.rs +++ b/tests/reftest.rs @@ -7,7 +7,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(collections, exit_status, fs_walk, io, path, path_ext, slice_patterns, std_misc, test)] +#![feature(collections, exit_status, fs_walk, path_ext, slice_patterns, test)] #[macro_use] extern crate bitflags; extern crate png; extern crate test; @@ -19,7 +19,6 @@ use std::fs::{PathExt, File, walk_dir}; use std::io::{self, Read, Result}; use std::path::{Path, PathBuf}; use std::process::{Command, Stdio}; -use std::thunk::Thunk; use test::{AutoColor, DynTestName, DynTestFn, TestDesc, TestOpts, TestDescAndFn, ShouldPanic}; use test::run_tests_console; use url::Url; |