servo: Merge #14735 - Remove unused ConstellationMsg from net_traits (from servo:ConstellationMsg); r=KiChjang

Source-Repo: https://github.com/servo/servo
Source-Revision: ab788e72aa7d63452c4c5a759e8abc918d665c6a
This commit is contained in:
Ms2ger 2016-12-26 01:43:39 -08:00
Родитель 4cc00f2dc6
Коммит 6a4ef994b3
1 изменённых файлов: 0 добавлений и 7 удалений

Просмотреть файл

@ -42,7 +42,6 @@ use hyper::mime::{Attr, Mime};
use hyper_serde::Serde;
use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
use ipc_channel::router::ROUTER;
use msg::constellation_msg::PipelineId;
use request::{Request, RequestInit};
use response::{HttpsState, Response};
use servo_url::ServoUrl;
@ -500,12 +499,6 @@ pub fn unwrap_websocket_protocol(wsp: Option<&header::WebSocketProtocol>) -> Opt
#[derive(Clone, PartialEq, Eq, Copy, Hash, Debug, Deserialize, Serialize, HeapSizeOf)]
pub struct ResourceId(pub u32);
#[derive(Deserialize, Serialize)]
pub enum ConstellationMsg {
/// Queries whether a pipeline or its ancestors are private
IsPrivate(PipelineId, IpcSender<bool>),
}
/// Network errors that have to be exported out of the loaders
#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize, HeapSizeOf)]
pub enum NetworkError {