mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Update font-kit.
This commit is contained in:
parent
e57b9a3446
commit
72fd95f613
6 changed files with 74 additions and 104 deletions
|
@ -31,4 +31,4 @@ url = "2.0"
|
|||
std_test_override = { path = "../std_test_override" }
|
||||
|
||||
[target.'cfg(not(target_os = "android"))'.dependencies]
|
||||
dirs = "2.0.2"
|
||||
dirs-next = "2.0"
|
||||
|
|
|
@ -15,7 +15,7 @@ use std::path::PathBuf;
|
|||
not(target_os = "android")
|
||||
))]
|
||||
pub fn default_config_dir() -> Option<PathBuf> {
|
||||
let mut config_dir = ::dirs::config_dir().unwrap();
|
||||
let mut config_dir = ::dirs_next::config_dir().unwrap();
|
||||
config_dir.push("servo");
|
||||
config_dir.push("default");
|
||||
Some(config_dir)
|
||||
|
@ -30,14 +30,14 @@ pub fn default_config_dir() -> Option<PathBuf> {
|
|||
pub fn default_config_dir() -> Option<PathBuf> {
|
||||
// FIXME: use `config_dir()` ($HOME/Library/Preferences)
|
||||
// instead of `data_dir()` ($HOME/Library/Application Support) ?
|
||||
let mut config_dir = ::dirs::data_dir().unwrap();
|
||||
let mut config_dir = ::dirs_next::data_dir().unwrap();
|
||||
config_dir.push("Servo");
|
||||
Some(config_dir)
|
||||
}
|
||||
|
||||
#[cfg(all(target_os = "windows", not(feature = "uwp")))]
|
||||
pub fn default_config_dir() -> Option<PathBuf> {
|
||||
let mut config_dir = ::dirs::config_dir().unwrap();
|
||||
let mut config_dir = ::dirs_next::config_dir().unwrap();
|
||||
config_dir.push("Servo");
|
||||
Some(config_dir)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue