aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/layout_debug.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-03-21 05:12:45 -0600
committerbors-servo <metajack+bors@gmail.com>2015-03-21 05:12:45 -0600
commit29a36adbe7d87fb38ba9bef3a718c6c823fb5977 (patch)
treefa6ead91920d78dc1ab8169304f44b2e4abc2987 /components/layout/layout_debug.rs
parentec60f29203c75b46d59253c7cbb4005fce7e4ad4 (diff)
parent3479d3fa7fbbfbcdbc92a93896b4a347338fe103 (diff)
downloadservo-29a36adbe7d87fb38ba9bef3a718c6c823fb5977.tar.gz
servo-29a36adbe7d87fb38ba9bef3a718c6c823fb5977.zip
auto merge of #5296 : servo/servo/unsafe_code, r=Ms2ger
Diffstat (limited to 'components/layout/layout_debug.rs')
-rw-r--r--components/layout/layout_debug.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/layout_debug.rs b/components/layout/layout_debug.rs
index ecc42408982..79bd12ce8a5 100644
--- a/components/layout/layout_debug.rs
+++ b/components/layout/layout_debug.rs
@@ -6,6 +6,7 @@
//! 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;
@@ -96,7 +97,6 @@ impl Drop for Scope {
/// Generate a unique ID. This is used for items such as Fragment
/// which are often reallocated but represent essentially the
/// same data.
-#[allow(unsafe_blocks)]
pub fn generate_unique_debug_id() -> u16 {
unsafe { DEBUG_ID_COUNTER.fetch_add(1, Ordering::SeqCst) as u16 }
}