diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2017-02-10 02:35:26 +0100 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-02-18 21:09:46 +0100 |
commit | fe3f4ff0c2c7f06be0b4fb4214d1cb86b1e796d8 (patch) | |
tree | 7f8a1627a61298f745978a65e966d3674bffae6d /components/constellation/pipeline.rs | |
parent | 26d6c96b18c02c02522d706e9ce5e24ee381a45e (diff) | |
download | servo-fe3f4ff0c2c7f06be0b4fb4214d1cb86b1e796d8.tar.gz servo-fe3f4ff0c2c7f06be0b4fb4214d1cb86b1e796d8.zip |
Update serde to 0.9 (fixes #15325)
Diffstat (limited to 'components/constellation/pipeline.rs')
-rw-r--r-- | components/constellation/pipeline.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs index 41dc6cf1667..19c68a2fefc 100644 --- a/components/constellation/pipeline.rs +++ b/components/constellation/pipeline.rs @@ -11,7 +11,7 @@ use euclid::scale_factor::ScaleFactor; use euclid::size::TypedSize2D; use event_loop::EventLoop; use gfx::font_cache_thread::FontCacheThread; -use ipc_channel::SerializeError; +use ipc_channel::Error; use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use ipc_channel::router::ROUTER; use layout_traits::LayoutThreadFactory; @@ -178,7 +178,7 @@ pub struct InitialPipelineState { impl Pipeline { /// Starts a layout thread, and possibly a script thread, in /// a new process if requested. - pub fn spawn<Message, LTF, STF>(state: InitialPipelineState) -> Result<Pipeline, SerializeError> + pub fn spawn<Message, LTF, STF>(state: InitialPipelineState) -> Result<Pipeline, Error> where LTF: LayoutThreadFactory<Message=Message>, STF: ScriptThreadFactory<Message=Message> { @@ -523,7 +523,7 @@ impl UnprivilegedPipelineContent { } #[cfg(not(target_os = "windows"))] - pub fn spawn_multiprocess(self) -> Result<(), SerializeError> { + pub fn spawn_multiprocess(self) -> Result<(), Error> { use gaol::sandbox::{self, Sandbox, SandboxMethods}; use ipc_channel::ipc::IpcOneShotServer; use sandboxing::content_process_sandbox_profile; @@ -571,7 +571,7 @@ impl UnprivilegedPipelineContent { } #[cfg(target_os = "windows")] - pub fn spawn_multiprocess(self) -> Result<(), SerializeError> { + pub fn spawn_multiprocess(self) -> Result<(), Error> { error!("Multiprocess is not supported on Windows."); process::exit(1); } |