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 dirs crate from use in UWP builds.

Browse source
This commit is contained in:
Josh Matthews 2019-06-11 09:02:40 -04:00
parent 237ef8da34
commit 3e22b52b47
7 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/config/Cargo.toml
View file

@ -6,6 +6,9 @@ license = "MPL-2.0"
edition = "2018" edition = "2018"
publish = false publish = false
[features]
uwp = []
[lib] [lib]
name = "servo_config" name = "servo_config"
path = "lib.rs" path = "lib.rs"
@ -29,5 +32,5 @@ servo_config_plugins = { path = "../config_plugins" }
env_logger = "0.6" env_logger = "0.6"
std_test_override = { path = "../std_test_override" } std_test_override = { path = "../std_test_override" }
[target.'cfg(not(target_os = "android"))'.dependencies] [target.'cfg(not(any(target_os = "android", feature = "uwp")))'.dependencies]
dirs = "1.0" dirs = "1.0"

7
components/config/basedir.rs
View file

@ -35,9 +35,14 @@ pub fn default_config_dir() -> Option<PathBuf> {
Some(config_dir) Some(config_dir)
} }
#[cfg(target_os = "windows")] #[cfg(all(target_os = "windows", not(feature = "uwp")))]
pub fn default_config_dir() -> Option<PathBuf> { pub fn default_config_dir() -> Option<PathBuf> {
let mut config_dir = ::dirs::config_dir().unwrap(); let mut config_dir = ::dirs::config_dir().unwrap();
config_dir.push("Servo"); config_dir.push("Servo");
Some(config_dir) Some(config_dir)
} }
#[cfg(all(target_os = "windows", feature = "uwp"))]
pub fn default_config_dir() -> Option<PathBuf> {
None
}

2
components/config/prefs.rs
View file

@ -58,7 +58,7 @@ pub fn pref_map() -> &'static Preferences<'static, Prefs> {
&PREFS &PREFS
} }
pub fn add_user_prefs() { pub(crate) fn add_user_prefs() {
if let Some(path) = user_prefs_path() { if let Some(path) = user_prefs_path() {
init_user_prefs(path); init_user_prefs(path);
} }

2
components/config/tests/prefs.rs
View file

@ -244,7 +244,7 @@ fn test_set_all_error_on_unknown_field() -> Result<(), Box<dyn Error>> {
Ok(()) Ok(())
} }
#[cfg(not(target_os = "android"))] #[cfg(not(any(target_os = "android", feature = "uwp")))]
#[test] #[test]
fn test_default_config_dir_create_read_write() { fn test_default_config_dir_create_read_write() {
let json_str = "{\ let json_str = "{\

1
components/servo/Cargo.toml
View file

@ -21,6 +21,7 @@ js_backtrace = ["script/js_backtrace"]
max_log_level = ["log/release_max_level_info"] max_log_level = ["log/release_max_level_info"]
native-bluetooth = ["bluetooth/native-bluetooth"] native-bluetooth = ["bluetooth/native-bluetooth"]
raqote_backend = ["canvas/raqote_backend"] raqote_backend = ["canvas/raqote_backend"]
uwp = ["servo_config/uwp"]
webrender_debugger = ["webrender/debugger"] webrender_debugger = ["webrender/debugger"]
no_static_freetype = ["webrender/no_static_freetype"] no_static_freetype = ["webrender/no_static_freetype"]
oculusvr = ["webvr/oculusvr"] oculusvr = ["webvr/oculusvr"]

1
ports/libsimpleservo/api/Cargo.toml
View file

@ -40,4 +40,5 @@ oculusvr = ["libservo/oculusvr"]
raqote_backend = ["libservo/raqote_backend"] raqote_backend = ["libservo/raqote_backend"]
webdriver = ["libservo/webdriver"] webdriver = ["libservo/webdriver"]
unstable = ["libservo/unstable"] unstable = ["libservo/unstable"]
uwp = ["libservo/uwp"]
webgl_backtrace = ["libservo/webgl_backtrace"] webgl_backtrace = ["libservo/webgl_backtrace"]

1
ports/libsimpleservo/capi/Cargo.toml
View file

@ -33,5 +33,6 @@ native-bluetooth = ["simpleservo/native-bluetooth"]
oculusvr = ["simpleservo/oculusvr"] oculusvr = ["simpleservo/oculusvr"]
raqote_backend = ["simpleservo/raqote_backend"] raqote_backend = ["simpleservo/raqote_backend"]
unstable = ["simpleservo/unstable"] unstable = ["simpleservo/unstable"]
uwp = ["simpleservo/uwp"]
webdriver = ["simpleservo/webdriver"] webdriver = ["simpleservo/webdriver"]
webgl_backtrace = ["simpleservo/webgl_backtrace"] webgl_backtrace = ["simpleservo/webgl_backtrace"]