зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #5952 - Various cleanup (from Ms2ger:cleanup); r=saneyuki
Source-Repo: https://github.com/servo/servo Source-Revision: e779e8905ba530eddf6777dfb7565131cfcd1830
This commit is contained in:
Родитель
178b16eed9
Коммит
ed3b6c3e4f
|
@ -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,
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
#![feature(plugin)]
|
||||
#![feature(rustc_private)]
|
||||
#![feature(std_misc)]
|
||||
#![feature(unboxed_closures)]
|
||||
|
||||
#![plugin(regex_macros)]
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче