diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2016-07-27 09:44:47 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-07-27 10:22:06 +0200 |
commit | 1662e292d8c3ec85329a204d57c5c07e4cc743ad (patch) | |
tree | 8b1aa4222f7b1b2582c519d901b50b70b9c2f6d8 /components/net/storage_thread.rs | |
parent | c1409af5438213d5a697aa83e983f8100c660b74 (diff) | |
download | servo-1662e292d8c3ec85329a204d57c5c07e4cc743ad.tar.gz servo-1662e292d8c3ec85329a204d57c5c07e4cc743ad.zip |
Remove use of util::opts from resource_thread
Diffstat (limited to 'components/net/storage_thread.rs')
-rw-r--r-- | components/net/storage_thread.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/components/net/storage_thread.rs b/components/net/storage_thread.rs index cc329f08922..3432e6aa873 100644 --- a/components/net/storage_thread.rs +++ b/components/net/storage_thread.rs @@ -8,6 +8,7 @@ use resource_thread; use std::borrow::ToOwned; use std::collections::BTreeMap; use std::collections::HashMap; +use std::path::Path; use url::Url; use util::opts; use util::thread::spawn_named; @@ -39,7 +40,8 @@ impl StorageManager { fn new(port: IpcReceiver<StorageThreadMsg>) -> StorageManager { let mut local_data = HashMap::new(); if let Some(ref config_dir) = opts::get().config_dir { - resource_thread::read_json_from_file(&mut local_data, config_dir, "local_data.json"); + resource_thread::read_json_from_file( + &mut local_data, Path::new(config_dir), "local_data.json"); } StorageManager { port: port, @@ -76,7 +78,8 @@ impl StorageManager { } StorageThreadMsg::Exit(sender) => { if let Some(ref config_dir) = opts::get().config_dir { - resource_thread::write_json_to_file(&self.local_data, config_dir, "local_data.json"); + resource_thread::write_json_to_file( + &self.local_data, Path::new(config_dir), "local_data.json"); } let _ = sender.send(()); break |