Remove util::ipc module (fixes #12312)

components/servo/Cargo.lock

@@ -2527,7 +2527,6 @@ dependencies = [
  "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",

components/util/Cargo.toml

@@ -11,7 +11,7 @@ path = "lib.rs"
 
 [features]
 # servo as opposed to geckolib
-servo = ["serde", "serde_derive", "ipc-channel", "app_units/plugins",
+servo = ["serde", "serde_derive", "app_units/plugins",
          "euclid/unstable", "url/heap_size", "url/serde", "plugins"]
 
 [dependencies]
@@ -20,7 +20,6 @@ bitflags = "0.7"
 euclid = "0.10.1"
 getopts = "0.2.11"
 heapsize = "0.3.0"
-ipc-channel = {version = "0.5", optional = true}
 lazy_static = "0.2"
 log = "0.3.5"
 num_cpus = "0.2.2"

components/util/ipc.rs

@@ -1,179 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-use ipc_channel::ipc::{self, IpcSender, OpaqueIpcSender};
-use ipc_channel::router::ROUTER;
-use opts;
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use std::any::{Any, TypeId};
-use std::collections::HashMap;
-use std::io::{Error, ErrorKind};
-use std::marker::Reflect;
-use std::mem;
-use std::sync::Mutex;
-use std::sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize, Ordering};
-use std::sync::mpsc::{self, Receiver, Sender};
-
-lazy_static! {
-    static ref IN_PROCESS_SENDERS: Mutex<HashMap<usize, OpaqueSender>> =
-        Mutex::new(HashMap::new());
-}
-
-static NEXT_SENDER_ID: AtomicUsize = ATOMIC_USIZE_INIT;
-
-pub enum OptionalIpcSender<T> where T: Deserialize + Serialize + Send + Any {
-    OutOfProcess(IpcSender<T>),
-    InProcess(Sender<T>),
-}
-
-impl<T> OptionalIpcSender<T> where T: Deserialize + Serialize + Send + Any {
-    pub fn send(&self, value: T) -> Result<(), Error> {
-        match *self {
-            OptionalIpcSender::OutOfProcess(ref ipc_sender) => ipc_sender.send(value),
-            OptionalIpcSender::InProcess(ref sender) => {
-                sender.send(value).map_err(|_| Error::new(ErrorKind::Other, "MPSC send failed"))
-            }
-        }
-    }
-
-    pub fn to_opaque(self) -> OptionalOpaqueIpcSender {
-        match self {
-            OptionalIpcSender::OutOfProcess(ipc_sender) => {
-                OptionalOpaqueIpcSender::OutOfProcess(ipc_sender.to_opaque())
-            }
-            OptionalIpcSender::InProcess(sender) => {
-                OptionalOpaqueIpcSender::InProcess(OpaqueSender::new(sender))
-            }
-        }
-    }
-}
-
-impl<T> Clone for OptionalIpcSender<T> where T: Deserialize + Serialize + Send + Any {
-    fn clone(&self) -> OptionalIpcSender<T> {
-        match *self {
-            OptionalIpcSender::OutOfProcess(ref ipc_sender) => {
-                OptionalIpcSender::OutOfProcess((*ipc_sender).clone())
-            }
-            OptionalIpcSender::InProcess(ref sender) => {
-                OptionalIpcSender::InProcess((*sender).clone())
-            }
-        }
-    }
-}
-
-impl<T> Deserialize for OptionalIpcSender<T> where T: Deserialize + Serialize + Send + Any {
-    fn deserialize<D>(deserializer: &mut D)
-                      -> Result<OptionalIpcSender<T>, D::Error> where D: Deserializer {
-        if opts::multiprocess() {
-            return Ok(OptionalIpcSender::OutOfProcess(try!(Deserialize::deserialize(
-                            deserializer))))
-        }
-        let id: usize = try!(Deserialize::deserialize(deserializer));
-        let sender = IN_PROCESS_SENDERS.lock().unwrap().remove(&id).unwrap();
-        Ok(OptionalIpcSender::InProcess(sender.to().unwrap()))
-     }
-}
-
-impl<T> Serialize for OptionalIpcSender<T> where T: Deserialize + Serialize + Send + Any {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
-        match *self {
-            OptionalIpcSender::OutOfProcess(ref ipc_sender) => ipc_sender.serialize(serializer),
-            OptionalIpcSender::InProcess(ref sender) => {
-                let id = NEXT_SENDER_ID.fetch_add(1, Ordering::SeqCst);
-                IN_PROCESS_SENDERS.lock()
-                                  .unwrap()
-                                  .insert(id, OpaqueSender::new((*sender).clone()));
-                id.serialize(serializer)
-            }
-        }
-    }
-}
-
-#[derive(Clone)]
-pub enum OptionalOpaqueIpcSender {
-    OutOfProcess(OpaqueIpcSender),
-    InProcess(OpaqueSender),
-}
-
-impl OptionalOpaqueIpcSender {
-    pub fn to<T>(self) -> OptionalIpcSender<T>
-                 where T: Deserialize + Serialize + Send + Any + 'static {
-        match self {
-            OptionalOpaqueIpcSender::OutOfProcess(ipc_sender) => {
-                OptionalIpcSender::OutOfProcess(ipc_sender.to())
-            }
-            OptionalOpaqueIpcSender::InProcess(sender) => {
-                OptionalIpcSender::InProcess(sender.to().unwrap())
-            }
-        }
-    }
-}
-
-impl Deserialize for OptionalOpaqueIpcSender {
-    fn deserialize<D>(deserializer: &mut D)
-                      -> Result<OptionalOpaqueIpcSender, D::Error> where D: Deserializer {
-        if opts::multiprocess() {
-            return Ok(OptionalOpaqueIpcSender::OutOfProcess(try!(Deserialize::deserialize(
-                            deserializer))))
-        }
-        let id: usize = try!(Deserialize::deserialize(deserializer));
-        let sender = IN_PROCESS_SENDERS.lock().unwrap().remove(&id).unwrap();
-        Ok(OptionalOpaqueIpcSender::InProcess(sender))
-     }
-}
-
-impl Serialize for OptionalOpaqueIpcSender {
-    fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
-        match *self {
-            OptionalOpaqueIpcSender::OutOfProcess(ref ipc_sender) => {
-                ipc_sender.serialize(serializer)
-            }
-            OptionalOpaqueIpcSender::InProcess(ref sender) => {
-                let id = NEXT_SENDER_ID.fetch_add(1, Ordering::SeqCst);
-                IN_PROCESS_SENDERS.lock().unwrap().insert(id, (*sender).clone());
-                id.serialize(serializer)
-            }
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct OpaqueSender {
-    sender: Sender<()>,
-    id: TypeId,
-}
-
-impl OpaqueSender {
-    fn new<T>(sender: Sender<T>) -> OpaqueSender where T: 'static + Reflect + Send {
-        unsafe {
-            OpaqueSender {
-                sender: mem::transmute::<_, Sender<()>>(sender),
-                id: TypeId::of::<T>(),
-            }
-        }
-    }
-
-    fn to<T>(self) -> Option<Sender<T>> where T: 'static + Reflect + Send {
-        unsafe {
-            if self.id != TypeId::of::<T>() {
-                None
-            } else {
-                Some(mem::transmute::<_, Sender<T>>(self.sender))
-            }
-        }
-    }
-}
-
-pub fn optional_ipc_channel<T>() -> (OptionalIpcSender<T>, Receiver<T>)
-                                 where T: Deserialize + Serialize + Send + Any {
-    if opts::multiprocess() {
-        let (ipc_sender, ipc_receiver) = ipc::channel().unwrap();
-        let receiver = ROUTER.route_ipc_receiver_to_new_mpsc_receiver(ipc_receiver);
-        (OptionalIpcSender::OutOfProcess(ipc_sender), receiver)
-    } else {
-        let (sender, receiver) = mpsc::channel();
-        (OptionalIpcSender::InProcess(sender), receiver)
-    }
-}
-

components/util/lib.rs

@@ -18,7 +18,6 @@ extern crate core;
 #[macro_use] extern crate euclid;
 extern crate getopts;
 #[macro_use] extern crate heapsize;
-#[cfg(feature = "servo")] extern crate ipc_channel;
 #[allow(unused_extern_crates)] #[macro_use] extern crate lazy_static;
 #[macro_use] extern crate log;
 extern crate num_cpus;
@@ -31,7 +30,6 @@ extern crate xdg;
 
 pub mod basedir;
 pub mod geometry;
-#[cfg(feature = "servo")] #[allow(unsafe_code)] pub mod ipc;
 #[allow(unsafe_code)] pub mod opts;
 pub mod prefs;
 #[cfg(feature = "servo")] pub mod remutex;

ports/cef/Cargo.lock

@@ -2392,7 +2392,6 @@ dependencies = [
  "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",