diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml index c1d14c3c31a..baf7d340cb2 100644 --- a/components/profile/Cargo.toml +++ b/components/profile/Cargo.toml @@ -10,9 +10,6 @@ publish = false name = "profile" path = "lib.rs" -[features] -unstable = ["servo_allocator"] - [dependencies] profile_traits = {path = "../profile_traits"} influent = "0.5" @@ -33,4 +30,4 @@ regex = "1.1" [target.'cfg(not(target_os = "windows"))'.dependencies] libc = "0.2" -servo_allocator = {path = "../allocator", optional = true} +servo_allocator = {path = "../allocator"} diff --git a/components/profile/mem.rs b/components/profile/mem.rs index cf67560ad83..bb4688f397c 100644 --- a/components/profile/mem.rs +++ b/components/profile/mem.rs @@ -389,14 +389,14 @@ mod system_reporter { use super::{JEMALLOC_HEAP_ALLOCATED_STR, SYSTEM_HEAP_ALLOCATED_STR}; #[cfg(target_os = "linux")] use libc::c_int; - #[cfg(all(feature = "unstable", not(target_os = "windows")))] + #[cfg(not(target_os = "windows"))] use libc::{c_void, size_t}; use profile_traits::mem::{Report, ReportKind, ReporterRequest}; - #[cfg(all(feature = "unstable", not(target_os = "windows")))] + #[cfg(not(target_os = "windows"))] use std::ffi::CString; - #[cfg(all(feature = "unstable", not(target_os = "windows")))] + #[cfg(not(target_os = "windows"))] use std::mem::size_of; - #[cfg(all(feature = "unstable", not(target_os = "windows")))] + #[cfg(not(target_os = "windows"))] use std::ptr::null_mut; #[cfg(target_os = "macos")] use task_info::task_basic_info::{resident_size, virtual_size}; @@ -495,10 +495,10 @@ mod system_reporter { None } - #[cfg(all(feature = "unstable", not(target_os = "windows")))] + #[cfg(not(target_os = "windows"))] use servo_allocator::jemalloc_sys::mallctl; - #[cfg(all(feature = "unstable", not(target_os = "windows")))] + #[cfg(not(target_os = "windows"))] fn jemalloc_stat(value_name: &str) -> Option { // Before we request the measurement of interest, we first send an "epoch" // request. Without that jemalloc gives cached statistics(!) which can be @@ -545,7 +545,7 @@ mod system_reporter { Some(value as usize) } - #[cfg(any(target_os = "windows", not(feature = "unstable")))] + #[cfg(target_os = "windows")] fn jemalloc_stat(_value_name: &str) -> Option { None } diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 0b959ad2ef1..feeeccce618 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -28,7 +28,6 @@ no_static_freetype = ["webrender/no_static_freetype"] oculusvr = ["webvr/oculusvr"] unstable = [ "euclid/unstable", - "profile/unstable", "script/unstable", ] webdriver = ["webdriver_server"]