Reformat WebSocketNetworkEvent::ConnectionEstablished and CoreResourceMsg::SetCookieForUrl.

This commit is contained in:
Ms2ger 2017-01-03 15:05:07 +01:00
parent 22f85bfed6
commit 01114ebcf8

View file

@ -316,12 +316,10 @@ pub enum WebSocketDomAction {
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize)]
pub enum WebSocketNetworkEvent { pub enum WebSocketNetworkEvent {
ConnectionEstablished( ConnectionEstablished(#[serde(deserialize_with = "::hyper_serde::deserialize",
#[serde(deserialize_with = "::hyper_serde::deserialize", serialize_with = "::hyper_serde::serialize")]
serialize_with = "::hyper_serde::serialize")] header::Headers,
header::Headers, Vec<String>),
Vec<String>
),
MessageReceived(MessageData), MessageReceived(MessageData),
Close(Option<u16>, String), Close(Option<u16>, String),
Fail, Fail,
@ -346,13 +344,11 @@ pub enum CoreResourceMsg {
/// Try to make a websocket connection to a URL. /// Try to make a websocket connection to a URL.
WebsocketConnect(WebSocketCommunicate, WebSocketConnectData), WebsocketConnect(WebSocketCommunicate, WebSocketConnectData),
/// Store a cookie for a given originating URL /// Store a cookie for a given originating URL
SetCookieForUrl( SetCookieForUrl(ServoUrl,
ServoUrl, #[serde(deserialize_with = "::hyper_serde::deserialize",
#[serde(deserialize_with = "::hyper_serde::deserialize", serialize_with = "::hyper_serde::serialize")]
serialize_with = "::hyper_serde::serialize")] Cookie,
Cookie, CookieSource),
CookieSource
),
/// Store cookies for a given originating URL /// Store cookies for a given originating URL
SetCookiesForUrl(ServoUrl, Vec<Serde<Cookie>>, CookieSource), SetCookiesForUrl(ServoUrl, Vec<Serde<Cookie>>, CookieSource),
/// Retrieve the stored cookies for a given URL /// Retrieve the stored cookies for a given URL