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

Remove servo feature from servo_config

Browse source
This commit is contained in:
Xidorn Quan 2017-04-07 17:44:22 +10:00
parent c857878ce9
commit e07cf0a8da
10 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/compositing/Cargo.toml
View file

@ -20,7 +20,7 @@ msg = {path = "../msg"}
net_traits = {path = "../net_traits"} net_traits = {path = "../net_traits"}
profile_traits = {path = "../profile_traits"} profile_traits = {path = "../profile_traits"}
script_traits = {path = "../script_traits"} script_traits = {path = "../script_traits"}
servo_config = {path = "../config", features = ["servo"]} servo_config = {path = "../config"}
servo_geometry = {path = "../geometry", features = ["servo"]} servo_geometry = {path = "../geometry", features = ["servo"]}
servo_url = {path = "../url", features = ["servo"]} servo_url = {path = "../url", features = ["servo"]}
style_traits = {path = "../style_traits"} style_traits = {path = "../style_traits"}

10
components/config/Cargo.toml
View file

@ -9,10 +9,6 @@ publish = false
name = "servo_config" name = "servo_config"
path = "lib.rs" path = "lib.rs"
[features]
# servo as opposed to geckolib
servo = ["serde", "serde_derive", "servo_url/servo"]
[dependencies] [dependencies]
euclid = "0.11" euclid = "0.11"
getopts = "0.2.11" getopts = "0.2.11"
@ -20,10 +16,10 @@ lazy_static = "0.2"
log = "0.3.5" log = "0.3.5"
num_cpus = "1.1.0" num_cpus = "1.1.0"
rustc-serialize = "0.3" rustc-serialize = "0.3"
serde = {version = "0.9", optional = true} serde = {version = "0.9"}
serde_derive = {version = "0.9", optional = true} serde_derive = {version = "0.9"}
servo_geometry = {path = "../geometry"} servo_geometry = {path = "../geometry"}
servo_url = {path = "../url"} servo_url = {path = "../url", features = ["servo"]}
url = "1.2" url = "1.2"
[dev-dependencies] [dev-dependencies]

2
components/config/lib.rs
View file

@ -10,7 +10,7 @@ extern crate getopts;
#[macro_use] extern crate log; #[macro_use] extern crate log;
extern crate num_cpus; extern crate num_cpus;
extern crate rustc_serialize; extern crate rustc_serialize;
#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive; #[macro_use] extern crate serde_derive;
extern crate servo_geometry; extern crate servo_geometry;
extern crate servo_url; extern crate servo_url;
extern crate url; extern crate url;

6
components/config/opts.rs
View file

@ -25,8 +25,7 @@ use url::{self, Url};
/// Global flags for Servo, currently set on the command line. /// Global flags for Servo, currently set on the command line.
#[derive(Clone)] #[derive(Clone, Deserialize, Serialize)]
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
pub struct Opts { pub struct Opts {
pub is_running_problem_test: bool, pub is_running_problem_test: bool,
@ -446,8 +445,7 @@ fn print_debug_usage(app: &str) -> ! {
process::exit(0) process::exit(0)
} }
#[derive(Clone)] #[derive(Clone, Deserialize, Serialize)]
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
pub enum OutputOptions { pub enum OutputOptions {
FileName(String), FileName(String),
Stdout(f64) Stdout(f64)

6
components/config/prefs.rs
View file

@ -20,8 +20,7 @@ lazy_static! {
}; };
} }
#[derive(PartialEq, Clone, Debug)] #[derive(PartialEq, Clone, Debug, Deserialize, Serialize)]
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
pub enum PrefValue { pub enum PrefValue {
Boolean(bool), Boolean(bool),
String(String), String(String),
@ -92,8 +91,7 @@ impl ToJson for PrefValue {
} }
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
pub enum Pref { pub enum Pref {
NoDefault(Arc<PrefValue>), NoDefault(Arc<PrefValue>),
WithDefault(Arc<PrefValue>, Option<Arc<PrefValue>>) WithDefault(Arc<PrefValue>, Option<Arc<PrefValue>>)

2
components/constellation/Cargo.toml
View file

@ -33,7 +33,7 @@ script_traits = {path = "../script_traits"}
serde = "0.9" serde = "0.9"
serde_derive = "0.9" serde_derive = "0.9"
style_traits = {path = "../style_traits"} style_traits = {path = "../style_traits"}
servo_config = {path = "../config", features = ["servo"]} servo_config = {path = "../config"}
servo_rand = {path = "../rand"} servo_rand = {path = "../rand"}
servo_remutex = {path = "../remutex"} servo_remutex = {path = "../remutex"}
servo_url = {path = "../url", features = ["servo"]} servo_url = {path = "../url", features = ["servo"]}

2
components/net_traits/Cargo.toml
View file

@ -24,7 +24,7 @@ msg = {path = "../msg"}
num-traits = "0.1.32" num-traits = "0.1.32"
serde = "0.9" serde = "0.9"
serde_derive = "0.9" serde_derive = "0.9"
servo_config = {path = "../config", features = ["servo"]} servo_config = {path = "../config"}
servo_url = {path = "../url", features = ["servo"]} servo_url = {path = "../url", features = ["servo"]}
url = {version = "1.2", features = ["heap_size"]} url = {version = "1.2", features = ["heap_size"]}
uuid = {version = "0.4", features = ["v4", "serde"]} uuid = {version = "0.4", features = ["v4", "serde"]}

2
components/profile/Cargo.toml
View file

@ -17,7 +17,7 @@ log = "0.3.5"
serde = "0.9" serde = "0.9"
serde_derive = "0.9" serde_derive = "0.9"
serde_json = "0.9" serde_json = "0.9"
servo_config = {path = "../config", features = ["servo"]} servo_config = {path = "../config"}
time = "0.1.12" time = "0.1.12"
[target.'cfg(target_os = "macos")'.dependencies] [target.'cfg(target_os = "macos")'.dependencies]

2
components/script/Cargo.toml
View file

@ -77,7 +77,7 @@ script_traits = {path = "../script_traits"}
selectors = { path = "../selectors" } selectors = { path = "../selectors" }
serde = "0.9" serde = "0.9"
servo_atoms = {path = "../atoms"} servo_atoms = {path = "../atoms"}
servo_config = {path = "../config", features = ["servo"] } servo_config = {path = "../config"}
servo_geometry = {path = "../geometry" } servo_geometry = {path = "../geometry" }
servo_rand = {path = "../rand"} servo_rand = {path = "../rand"}
servo_url = {path = "../url", features = ["servo"]} servo_url = {path = "../url", features = ["servo"]}

2
components/webdriver_server/Cargo.toml
View file

@ -22,7 +22,7 @@ net_traits = {path = "../net_traits"}
regex = "0.2" regex = "0.2"
rustc-serialize = "0.3.4" rustc-serialize = "0.3.4"
script_traits = {path = "../script_traits"} script_traits = {path = "../script_traits"}
servo_config = {path = "../config", features = ["servo"]} servo_config = {path = "../config"}
servo_url = {path = "../url", features = ["servo"]} servo_url = {path = "../url", features = ["servo"]}
url = {version = "1.2", features = ["heap_size"]} url = {version = "1.2", features = ["heap_size"]}
uuid = {version = "0.4", features = ["v4"]} uuid = {version = "0.4", features = ["v4"]}