Remove `default-except-unstable`

… and use remaining unstable features unconditionally.
This doesn’t actually change the set of crates that can build on the Stable channel.

6 files changed, 8 insertions, 19 deletions

diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
index 2a6f1302d22..0caa2a1dede 100644
--- a/ports/glutin/Cargo.toml
+++ b/ports/glutin/Cargo.toml
@@ -28,8 +28,7 @@ ProductName = "Servo"
 
 [features]
 azure_backend = ["libservo/azure_backend"]
-default = ["unstable", "default-except-unstable"]
-default-except-unstable = ["webdriver", "max_log_level"]
+default = ["webdriver", "max_log_level"]
 energy-profiling = ["libservo/energy-profiling"]
 debugmozjs = ["libservo/debugmozjs"]
 js_backtrace = ["libservo/js_backtrace"]
@@ -37,7 +36,6 @@ max_log_level = ["log/release_max_level_info"]
 native-bluetooth = ["libservo/native-bluetooth"]
 profilemozjs = ["libservo/profilemozjs"]
 raqote_backend = ["libservo/raqote_backend"]
-unstable = ["libservo/unstable"]
 webdriver = ["libservo/webdriver"]
 webgl_backtrace = ["libservo/webgl_backtrace"]
 webrender_debugger = ["libservo/webrender_debugger"]
diff --git a/ports/glutin/main.rs b/ports/glutin/main.rs
index 23be648bad8..50da58121bc 100644
--- a/ports/glutin/main.rs
+++ b/ports/glutin/main.rs
@@ -15,7 +15,7 @@
 //!
 //! [glutin]: https://github.com/tomaka/glutin
 
-#![cfg_attr(feature = "unstable", feature(core_intrinsics))]
+#![feature(core_intrinsics)]
 
 #[cfg(not(target_os = "android"))]
 include!("main2.rs");
diff --git a/ports/glutin/main2.rs b/ports/glutin/main2.rs
index 496c0515e19..579c97d3a23 100644
--- a/ports/glutin/main2.rs
+++ b/ports/glutin/main2.rs
@@ -6,7 +6,7 @@
 extern crate lazy_static;
 #[macro_use]
 extern crate log;
-#[cfg(all(feature = "unstable", any(target_os = "macos", target_os = "linux")))]
+#[cfg(any(target_os = "macos", target_os = "linux"))]
 #[macro_use]
 extern crate sig;
 
@@ -42,13 +42,10 @@ pub mod platform {
     pub fn deinit() {}
 }
 
-#[cfg(any(
-    not(feature = "unstable"),
-    not(any(target_os = "macos", target_os = "linux"))
-))]
+#[cfg(not(any(target_os = "macos", target_os = "linux")))]
 fn install_crash_handler() {}
 
-#[cfg(all(feature = "unstable", any(target_os = "macos", target_os = "linux")))]
+#[cfg(any(target_os = "macos", target_os = "linux"))]
 fn install_crash_handler() {
     use backtrace::Backtrace;
     use libc::_exit;
diff --git a/ports/libsimpleservo/api/Cargo.toml b/ports/libsimpleservo/api/Cargo.toml
index 8e1726a8b02..6d618d14b14 100644
--- a/ports/libsimpleservo/api/Cargo.toml
+++ b/ports/libsimpleservo/api/Cargo.toml
@@ -27,8 +27,7 @@ gl_generator = "0.11"
 
 [features]
 azure_backend = ["libservo/azure_backend"]
-default = ["unstable", "default-except-unstable"]
-default-except-unstable = ["webdriver", "max_log_level"]
+default = ["webdriver", "max_log_level"]
 debugmozjs = ["libservo/debugmozjs"]
 energy-profiling = ["libservo/energy-profiling"]
 googlevr = ["libservo/googlevr"]
@@ -40,6 +39,5 @@ no_wgl = ["libservo/no_wgl"]
 oculusvr = ["libservo/oculusvr"]
 raqote_backend = ["libservo/raqote_backend"]
 webdriver = ["libservo/webdriver"]
-unstable = ["libservo/unstable"]
 uwp = ["libservo/uwp"]
 webgl_backtrace = ["libservo/webgl_backtrace"]
diff --git a/ports/libsimpleservo/capi/Cargo.toml b/ports/libsimpleservo/capi/Cargo.toml
index 1ca469d82c0..2e4a894e4f5 100644
--- a/ports/libsimpleservo/capi/Cargo.toml
+++ b/ports/libsimpleservo/capi/Cargo.toml
@@ -23,8 +23,7 @@ cbindgen = "0.8"
 [features]
 azure_backend = ["simpleservo/azure_backend"]
 debugmozjs = ["simpleservo/debugmozjs"]
-default = ["unstable", "default-except-unstable"]
-default-except-unstable = ["webdriver", "max_log_level"]
+default = ["webdriver", "max_log_level"]
 energy-profiling = ["simpleservo/energy-profiling"]
 googlevr = ["simpleservo/googlevr"]
 js_backtrace = ["simpleservo/js_backtrace"]
@@ -33,7 +32,6 @@ native-bluetooth = ["simpleservo/native-bluetooth"]
 no_wgl = ["simpleservo/no_wgl"]
 oculusvr = ["simpleservo/oculusvr"]
 raqote_backend = ["simpleservo/raqote_backend"]
-unstable = ["simpleservo/unstable"]
 uwp = ["simpleservo/uwp"]
 webdriver = ["simpleservo/webdriver"]
 webgl_backtrace = ["simpleservo/webgl_backtrace"]
diff --git a/ports/libsimpleservo/jniapi/Cargo.toml b/ports/libsimpleservo/jniapi/Cargo.toml
index 95a841770a0..5804832dd39 100644
--- a/ports/libsimpleservo/jniapi/Cargo.toml
+++ b/ports/libsimpleservo/jniapi/Cargo.toml
@@ -28,8 +28,7 @@ cc = "1.0"
 [features]
 azure_backend = ["simpleservo/azure_backend"]
 debugmozjs = ["simpleservo/debugmozjs"]
-default = ["unstable", "default-except-unstable"]
-default-except-unstable = ["webdriver", "max_log_level"]
+default = ["webdriver", "max_log_level"]
 energy-profiling = ["simpleservo/energy-profiling"]
 googlevr = ["simpleservo/googlevr"]
 js_backtrace = ["simpleservo/js_backtrace"]
@@ -37,6 +36,5 @@ max_log_level = ["simpleservo/max_log_level"]
 native-bluetooth = ["simpleservo/native-bluetooth"]
 oculusvr = ["simpleservo/oculusvr"]
 raqote_backend = ["simpleservo/raqote_backend"]
-unstable = ["simpleservo/unstable"]
 webdriver = ["simpleservo/webdriver"]
 webgl_backtrace = ["simpleservo/webgl_backtrace"]