10 files changed, 16 insertions, 48 deletions
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index 3818a2f30a6..a95fb6d1046 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -13,9 +13,6 @@ path = "lib.rs"
 test = false
 doctest = false
 
-[features]
-unstable = ["packed_simd"]
-
 [dependencies]
 app_units = "0.7"
 bitflags = "1.0"
@@ -31,7 +28,7 @@ log = "0.4"
 malloc_size_of = { path = "../malloc_size_of" }
 net_traits = {path = "../net_traits"}
 ordered-float = "1.0"
-packed_simd = {version = "0.3", optional = true}
+packed_simd = "0.3"
 range = {path = "../range"}
 serde = "1.0"
 servo_arc = {path = "../servo_arc"}
diff --git a/components/gfx/text/glyph.rs b/components/gfx/text/glyph.rs
index fc054c3caa3..82d002e61f4 100644
--- a/components/gfx/text/glyph.rs
+++ b/components/gfx/text/glyph.rs
@@ -4,10 +4,7 @@
 
 use app_units::Au;
 use euclid::Point2D;
-#[cfg(all(
-    feature = "unstable",
-    any(target_feature = "sse2", target_feature = "neon")
-))]
+#[cfg(any(target_feature = "sse2", target_feature = "neon"))]
 use packed_simd::u32x4;
 use range::{self, EachIndex, Range, RangeIndex};
 use std::cmp::{Ordering, PartialOrd};
@@ -75,7 +72,6 @@ pub type GlyphId = u32;
 // TODO: make this more type-safe.
 
 const FLAG_CHAR_IS_SPACE: u32 = 0x40000000;
-#[cfg(feature = "unstable")]
 #[cfg(any(target_feature = "sse2", target_feature = "neon"))]
 const FLAG_CHAR_IS_SPACE_SHIFT: u32 = 30;
 const FLAG_IS_SIMPLE_GLYPH: u32 = 0x80000000;
@@ -625,7 +621,6 @@ impl<'a> GlyphStore {
     }
 
     #[inline]
-    #[cfg(feature = "unstable")]
     #[cfg(any(target_feature = "sse2", target_feature = "neon"))]
     fn advance_for_byte_range_simple_glyphs(
         &self,
@@ -672,10 +667,7 @@ impl<'a> GlyphStore {
 
     /// When SIMD isn't available, fallback to the slow path.
     #[inline]
-    #[cfg(not(all(
-        feature = "unstable",
-        any(target_feature = "sse2", target_feature = "neon")
-    )))]
+    #[cfg(not(any(target_feature = "sse2", target_feature = "neon")))]
     fn advance_for_byte_range_simple_glyphs(
         &self,
         range: &Range<ByteIndex>,
@@ -686,7 +678,6 @@ impl<'a> GlyphStore {
 
     /// Used for SIMD.
     #[inline]
-    #[cfg(feature = "unstable")]
     #[cfg(any(target_feature = "sse2", target_feature = "neon"))]
     #[allow(unsafe_code)]
     fn transmute_entry_buffer_to_u32_buffer(&self) -> &[u32] {
diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
index 8c98a809c1a..9ae8a6f953d 100644
--- a/components/layout_thread/Cargo.toml
+++ b/components/layout_thread/Cargo.toml
@@ -10,9 +10,6 @@ publish = false
 name = "layout_thread"
 path = "lib.rs"
 
-[features]
-unstable = ["parking_lot/nightly"]
-
 [dependencies]
 app_units = "0.7"
 atomic_refcell = "0.1"
@@ -36,7 +33,7 @@ malloc_size_of = { path = "../malloc_size_of" }
 metrics = {path = "../metrics"}
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
-parking_lot = "0.8"
+parking_lot = {version = "0.8", features = ["nightly"]}
 profile_traits = {path = "../profile_traits"}
 range = {path = "../range"}
 rayon = "1"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index deeb5f7a3bf..1b9dade72eb 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -15,7 +15,6 @@ path = "lib.rs"
 [features]
 debugmozjs = ['js/debugmozjs']
 profilemozjs = ['js/profilemozjs']
-unstable = []
 unrooted_must_root_lint = ["script_plugins/unrooted_must_root_lint"]
 webidl_lint = ["script_plugins/webidl_lint"]
 default = ["unrooted_must_root_lint", "webidl_lint"]
diff --git a/components/script/dom/bindings/conversions.rs b/components/script/dom/bindings/conversions.rs
index 161354479b6..442648fb9c8 100644
--- a/components/script/dom/bindings/conversions.rs
+++ b/components/script/dom/bindings/conversions.rs
@@ -69,10 +69,7 @@ pub trait IDLInterface {
 }
 
 /// A trait to mark an IDL interface as deriving from another one.
-#[cfg_attr(
-    feature = "unstable",
-    rustc_on_unimplemented(message = "The IDL interface `{Self}` is not derived from `{T}`.")
-)]
+#[rustc_on_unimplemented(message = "The IDL interface `{Self}` is not derived from `{T}`.")]
 pub trait DerivedFrom<T: Castable>: Castable {}
 
 impl<T: Float + ToJSValConvertible> ToJSValConvertible for Finite<T> {
diff --git a/components/script/dom/bindings/root.rs b/components/script/dom/bindings/root.rs
index 228015b1275..c87c83a2469 100644
--- a/components/script/dom/bindings/root.rs
+++ b/components/script/dom/bindings/root.rs
@@ -330,13 +330,13 @@ impl<T: DomObject> Deref for Dom<T> {
 
 unsafe impl<T: DomObject> JSTraceable for Dom<T> {
     unsafe fn trace(&self, trc: *mut JSTracer) {
-        #[cfg(all(feature = "unstable", debug_assertions))]
-        let trace_str = format!("for {} on heap", ::std::intrinsics::type_name::<T>());
-        #[cfg(all(feature = "unstable", debug_assertions))]
-        let trace_info = &trace_str[..];
-        #[cfg(not(all(feature = "unstable", debug_assertions)))]
-        let trace_info = "for DOM object on heap";
-
+        let trace_string;
+        let trace_info = if cfg!(debug_assertions) {
+            trace_string = format!("for {} on heap", ::std::intrinsics::type_name::<T>());
+            &trace_string[..]
+        } else {
+            "for DOM object on heap"
+        };
         trace_reflector(trc, trace_info, (*self.ptr.as_ptr()).reflector());
     }
 }
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index a1afdc34a82..596fd711599 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -938,10 +938,7 @@ impl WindowMethods for Window {
 
     #[allow(unsafe_code)]
     fn Trap(&self) {
-        #[cfg(feature = "unstable")]
-        unsafe {
-            ::std::intrinsics::breakpoint()
-        }
+        unsafe { ::std::intrinsics::breakpoint() }
     }
 
     #[allow(unsafe_code)]
diff --git a/components/script/lib.rs b/components/script/lib.rs
index 9bc2d929b13..1be386dfd1c 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -2,11 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#![cfg_attr(feature = "unstable", feature(core_intrinsics))]
-#![cfg_attr(feature = "unstable", feature(on_unimplemented))]
 #![feature(const_fn)]
+#![feature(core_intrinsics)]
 #![feature(drain_filter)]
 #![feature(inner_deref)]
+#![feature(on_unimplemented)]
 #![feature(plugin)]
 #![feature(type_alias_enum_variants)]
 #![deny(unsafe_code)]
diff --git a/components/script/task.rs b/components/script/task.rs
index c8b4b438deb..61f9bf436dd 100644
--- a/components/script/task.rs
+++ b/components/script/task.rs
@@ -32,14 +32,7 @@ macro_rules! task {
 pub trait TaskOnce: Send {
     #[allow(unsafe_code)]
     fn name(&self) -> &'static str {
-        #[cfg(feature = "unstable")]
-        unsafe {
-            ::std::intrinsics::type_name::<Self>()
-        }
-        #[cfg(not(feature = "unstable"))]
-        {
-            "(task name unknown)"
-        }
+        unsafe { ::std::intrinsics::type_name::<Self>() }
     }
 
     fn run_once(self);
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index f4feaab5be5..86189c78f6b 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -26,9 +26,6 @@ uwp = ["servo_config/uwp"]
 webrender_debugger = ["webrender/debugger"]
 no_static_freetype = ["webrender/no_static_freetype"]
 oculusvr = ["webvr/oculusvr"]
-unstable = [
-    "script/unstable",
-]
 webdriver = ["webdriver_server"]
 webgl_backtrace = [
     "script/webgl_backtrace",