Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-28 01:30:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update serde to 0.8 (fixes #12659)

Browse source
This commit is contained in:
Anthony Ramine 2016-08-12 14:46:25 +02:00
parent a22913569c
commit 7ad51dcd7a
70 changed files with 919 additions and 778 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/net/http_loader.rs
View file

@ -24,6 +24,7 @@ use hyper::method::Method;
use hyper::mime::{Mime, SubLevel, TopLevel};
use hyper::net::Fresh;
use hyper::status::{StatusClass, StatusCode};
use hyper_serde::Serde;
use ipc_channel::ipc::{self, IpcSender};
use log;
use mime_classifier::MimeClassifier;
@ -1076,8 +1077,8 @@ pub fn load<A, B>(load_data: &LoadData,
Some(&ContentType(ref mime)) => Some(mime),
None => None
});
metadata.headers = Some(adjusted_headers);
metadata.status = Some(response.status_raw().clone());
metadata.headers = Some(Serde(adjusted_headers));
metadata.status = Some(Serde(response.status_raw().clone()));
metadata.https_state = if doc_url.scheme() == "https" {
HttpsState::Modern
} else {
@ -1092,7 +1093,8 @@ pub fn load<A, B>(load_data: &LoadData,
if let Some(ref chan) = devtools_chan {
send_response_to_devtools(
&chan, request_id,
metadata.headers.clone(), metadata.status.clone(),
metadata.headers.clone().map(Serde::into_inner),
metadata.status.clone().map(Serde::into_inner),
pipeline_id);
}
}