Bump serde to 1.0

This commit is contained in:
Bastien Orivel 2017-06-14 18:31:09 +02:00 committed by Simon Sapin
parent e1bce24129
commit 76d8573393
60 changed files with 487 additions and 474 deletions

View file

@ -16,10 +16,10 @@ cookie = "0.6"
devtools_traits = {path = "../devtools_traits"}
flate2 = "0.2.0"
hyper = "0.10"
hyper_serde = "0.6"
hyper_serde = "0.7"
hyper-openssl = "0.2.2"
immeta = "0.3.1"
ipc-channel = "0.7"
ipc-channel = "0.8"
lazy_static = "0.2"
log = "0.3.5"
matches = "0.1"
@ -30,9 +30,9 @@ net_traits = {path = "../net_traits"}
openssl = "0.9"
parse-hosts = "0.3.0"
profile_traits = {path = "../profile_traits"}
serde = "0.9"
serde_derive = "0.9"
serde_json = "0.9"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
servo_config = {path = "../config"}
servo_url = {path = "../url"}
servo-websocket = "0.19"
@ -40,7 +40,7 @@ threadpool = "1.0"
time = "0.1.17"
unicase = "1.4.0"
url = {version = "1.2", features = ["heap_size"]}
uuid = {version = "0.4", features = ["v4"]}
uuid = {version = "0.5", features = ["v4"]}
webrender_traits = {git = "https://github.com/servo/webrender", features = ["ipc"]}
[target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]

View file

@ -214,7 +214,7 @@ impl ResourceChannelManager {
}
pub fn read_json_from_file<T>(data: &mut T, config_dir: &Path, filename: &str)
where T: Deserialize
where T: for<'de> Deserialize<'de>
{
let path = config_dir.join(filename);
let display = path.display();