Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #5952 - Ms2ger:cleanup, r=saneyuki

Browse source 
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5952)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-05 14:26:37 -05:00
commit e779e8905b
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/layout/layout_debug.rs
View file

@ -6,7 +6,6 @@
//! that can be viewed by an external tool to make layout debugging easier. //! that can be viewed by an external tool to make layout debugging easier.
#![macro_use] #![macro_use]
#![allow(unsafe_code)] // thread_local!() defines an unsafe function on Android
use flow_ref::FlowRef; use flow_ref::FlowRef;
use flow; 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)); 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; pub struct Scope;
@ -98,7 +97,7 @@ impl Drop for Scope {
/// which are often reallocated but represent essentially the /// which are often reallocated but represent essentially the
/// same data. /// same data.
pub fn generate_unique_debug_id() -> u16 { 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, /// Begin a layout debug trace. If this has not been called,

1
components/net/lib.rs
View file

@ -10,7 +10,6 @@
#![feature(plugin)] #![feature(plugin)]
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]
#![feature(unboxed_closures)]
#![plugin(regex_macros)] #![plugin(regex_macros)]

3
tests/reftest.rs
View file

@ -7,7 +7,7 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // 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; #[macro_use] extern crate bitflags;
extern crate png; extern crate png;
extern crate test; extern crate test;
@ -19,7 +19,6 @@ use std::fs::{PathExt, File, walk_dir};
use std::io::{self, Read, Result}; use std::io::{self, Read, Result};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process::{Command, Stdio}; use std::process::{Command, Stdio};
use std::thunk::Thunk;
use test::{AutoColor, DynTestName, DynTestFn, TestDesc, TestOpts, TestDescAndFn, ShouldPanic}; use test::{AutoColor, DynTestName, DynTestFn, TestDesc, TestOpts, TestDescAndFn, ShouldPanic};
use test::run_tests_console; use test::run_tests_console;
use url::Url; use url::Url;