Skip to content

Commit

Permalink
Auto merge of #164 - Eijebong:serde1.0, r=jdm
Browse files Browse the repository at this point in the history 
Bump serde to 1.0, bincode to 0.8 and bump version
  • Loading branch information
bors-servo committed Jun 15, 2017
2 parents 479b4b3 + 7d0c49b commit 36e7f5f
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 33 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ipc-channel"
version = "0.7.2"
version = "0.8.0"
description = "A multiprocess drop-in replacement for Rust channels"
authors = ["The Servo Project Developers"]
license = "MIT/Apache-2.0"
Expand All @@ -12,12 +12,12 @@ memfd = ["syscall"]
unstable = []

[dependencies]
bincode = "1.0.0-alpha2"
bincode = "0.8"
lazy_static = "0.2"
libc = "0.2.12"
rand = "0.3"
serde = "0.9"
uuid = {version = "0.4", features = ["v4"]}
serde = { version="1.0", features=["rc"] }
uuid = {version = "0.5", features = ["v4"]}
fnv = "1.0.3"

[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
Expand Down
48 changes: 23 additions & 25 deletions src/ipc.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ thread_local! {
}

pub fn channel<T>() -> Result<(IpcSender<T>, IpcReceiver<T>),Error>
where T: Deserialize + Serialize {
where T: for<'de> Deserialize<'de> + Serialize {
let (os_sender, os_receiver) = try!(platform::channel());
let ipc_receiver = IpcReceiver {
os_receiver: os_receiver,
Expand All @@ -62,12 +62,12 @@ pub fn bytes_channel() -> Result<(IpcBytesSender, IpcBytesReceiver),Error> {
}

#[derive(Debug)]
pub struct IpcReceiver<T> where T: Deserialize + Serialize {
pub struct IpcReceiver<T> where T: for<'de> Deserialize<'de> + Serialize {
os_receiver: OsIpcReceiver,
phantom: PhantomData<T>,
}

impl<T> IpcReceiver<T> where T: Deserialize + Serialize {
impl<T> IpcReceiver<T> where T: for<'de> Deserialize<'de> + Serialize {
pub fn recv(&self) -> Result<T, bincode::Error> {
let (data, os_ipc_channels, os_ipc_shared_memory_regions) = try!(self.os_receiver.recv());
OpaqueIpcMessage::new(data, os_ipc_channels, os_ipc_shared_memory_regions).to()
Expand All @@ -86,8 +86,8 @@ impl<T> IpcReceiver<T> where T: Deserialize + Serialize {
}
}

impl<T> Deserialize for IpcReceiver<T> where T: Deserialize + Serialize {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
impl<'de, T> Deserialize<'de> for IpcReceiver<T> where T: for<'dde> Deserialize<'dde> + Serialize {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let index: usize = try!(Deserialize::deserialize(deserializer));
let os_receiver =
OS_IPC_CHANNELS_FOR_DESERIALIZATION.with(|os_ipc_channels_for_deserialization| {
Expand All @@ -102,7 +102,7 @@ impl<T> Deserialize for IpcReceiver<T> where T: Deserialize + Serialize {
}
}

impl<T> Serialize for IpcReceiver<T> where T: Deserialize + Serialize {
impl<T> Serialize for IpcReceiver<T> where T: for<'de> Deserialize<'de> + Serialize {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
let index = OS_IPC_CHANNELS_FOR_SERIALIZATION.with(|os_ipc_channels_for_serialization| {
let mut os_ipc_channels_for_serialization =
Expand Down Expand Up @@ -173,8 +173,8 @@ impl<T> IpcSender<T> where T: Serialize {
}
}

impl<T> Deserialize for IpcSender<T> where T: Serialize {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
impl<'de, T> Deserialize<'de> for IpcSender<T> where T: Serialize {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let os_sender = try!(deserialize_os_ipc_sender(deserializer));
Ok(IpcSender {
os_sender: os_sender,
Expand All @@ -201,7 +201,7 @@ impl IpcReceiverSet {
}

pub fn add<T>(&mut self, receiver: IpcReceiver<T>) -> Result<u64,Error>
where T: Deserialize + Serialize {
where T: for<'de> Deserialize<'de> + Serialize {
Ok(try!(self.os_receiver_set.add(receiver.os_receiver)))
}

Expand Down Expand Up @@ -249,8 +249,8 @@ impl Deref for IpcSharedMemory {
}
}

impl Deserialize for IpcSharedMemory {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
impl<'de> Deserialize<'de> for IpcSharedMemory {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let index: usize = try!(Deserialize::deserialize(deserializer));
let os_shared_memory = OS_IPC_SHARED_MEMORY_REGIONS_FOR_DESERIALIZATION.with(
|os_ipc_shared_memory_regions_for_deserialization| {
Expand Down Expand Up @@ -342,17 +342,15 @@ impl OpaqueIpcMessage {
}
}

pub fn to<T>(mut self) -> Result<T, bincode::Error> where T: Deserialize + Serialize {
pub fn to<T>(mut self) -> Result<T, bincode::Error> where T: for<'de> Deserialize<'de> + Serialize {
OS_IPC_CHANNELS_FOR_DESERIALIZATION.with(|os_ipc_channels_for_deserialization| {
OS_IPC_SHARED_MEMORY_REGIONS_FOR_DESERIALIZATION.with(
|os_ipc_shared_memory_regions_for_deserialization| {
mem::swap(&mut *os_ipc_channels_for_deserialization.borrow_mut(),
&mut self.os_ipc_channels);
mem::swap(&mut *os_ipc_shared_memory_regions_for_deserialization.borrow_mut(),
&mut self.os_ipc_shared_memory_regions);
let mut data = &*self.data;
let mut deserializer = bincode::Deserializer::new(&mut data, bincode::Infinite);
let result = Deserialize::deserialize(&mut deserializer);
let result = bincode::deserialize(&self.data[..]);
mem::swap(&mut *os_ipc_shared_memory_regions_for_deserialization.borrow_mut(),
&mut self.os_ipc_shared_memory_regions);
mem::swap(&mut *os_ipc_channels_for_deserialization.borrow_mut(),
Expand All @@ -371,16 +369,16 @@ pub struct OpaqueIpcSender {
}

impl OpaqueIpcSender {
pub fn to<T>(self) -> IpcSender<T> where T: Deserialize + Serialize {
pub fn to<'de, T>(self) -> IpcSender<T> where T: Deserialize<'de> + Serialize {
IpcSender {
os_sender: self.os_sender,
phantom: PhantomData,
}
}
}

impl Deserialize for OpaqueIpcSender {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
impl<'de> Deserialize<'de> for OpaqueIpcSender {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let os_sender = try!(deserialize_os_ipc_sender(deserializer));
Ok(OpaqueIpcSender {
os_sender: os_sender,
Expand All @@ -404,7 +402,7 @@ pub struct IpcOneShotServer<T> {
phantom: PhantomData<T>,
}

impl<T> IpcOneShotServer<T> where T: Deserialize + Serialize {
impl<T> IpcOneShotServer<T> where T: for<'de> Deserialize<'de> + Serialize {
pub fn new() -> Result<(IpcOneShotServer<T>, String),Error> {
let (os_server, name) = try!(OsIpcOneShotServer::new());
Ok((IpcOneShotServer {
Expand Down Expand Up @@ -446,8 +444,8 @@ impl IpcBytesReceiver {
}
}

impl Deserialize for IpcBytesReceiver {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
impl<'de> Deserialize<'de> for IpcBytesReceiver {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let index: usize = try!(Deserialize::deserialize(deserializer));
let os_receiver =
OS_IPC_CHANNELS_FOR_DESERIALIZATION.with(|os_ipc_channels_for_deserialization| {
Expand Down Expand Up @@ -488,8 +486,8 @@ impl Clone for IpcBytesSender {
}
}

impl Deserialize for IpcBytesSender {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer {
impl<'de> Deserialize<'de> for IpcBytesSender {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let os_sender = try!(deserialize_os_ipc_sender(deserializer));
Ok(IpcBytesSender {
os_sender: os_sender,
Expand Down Expand Up @@ -522,8 +520,8 @@ fn serialize_os_ipc_sender<S>(os_ipc_sender: &OsIpcSender, serializer: S)
index.serialize(serializer)
}

fn deserialize_os_ipc_sender<D>(deserializer: D)
-> Result<OsIpcSender, D::Error> where D: Deserializer {
fn deserialize_os_ipc_sender<'de, D>(deserializer: D)
-> Result<OsIpcSender, D::Error> where D: Deserializer<'de> {
let index: usize = try!(Deserialize::deserialize(deserializer));
OS_IPC_CHANNELS_FOR_DESERIALIZATION.with(|os_ipc_channels_for_deserialization| {
// FIXME(pcwalton): This could panic if the data was corrupt and the index was out of
Expand Down
4 changes: 2 additions & 2 deletions src/router.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl RouterProxy {
pub fn route_ipc_receiver_to_mpsc_sender<T>(&self,
ipc_receiver: IpcReceiver<T>,
mpsc_sender: Sender<T>)
where T: Deserialize +
where T: for<'de> Deserialize<'de> +
Serialize +
Send +
'static {
Expand All @@ -60,7 +60,7 @@ impl RouterProxy {
/// use of a `Router`.
pub fn route_ipc_receiver_to_new_mpsc_receiver<T>(&self, ipc_receiver: IpcReceiver<T>)
-> Receiver<T>
where T: Deserialize +
where T: for<'de> Deserialize<'de> +
Serialize +
Send +
'static {
Expand Down
4 changes: 2 additions & 2 deletions src/test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,9 @@ impl Serialize for HasWeirdSerializer {
}
}

impl Deserialize for HasWeirdSerializer {
impl<'de> Deserialize<'de> for HasWeirdSerializer {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where D: Deserializer
where D: Deserializer<'de>
{
Ok(HasWeirdSerializer(try!(Deserialize::deserialize(deserializer))))
}
Expand Down

0 comments on commit 36e7f5f

Please sign in to comment.