Skip to content

Commit

Permalink
Auto merge of #236 - gatoWololo:master, r=emilio
Browse files Browse the repository at this point in the history
Remove trait bounds on IpcSender and IpcReceiver.

Remove trait bounds on IpcSender and IpcReceiver declaration.
Remove trait bounds on trait implemation for Serialize and Deserialize.

Fixes #235
  • Loading branch information
bors-servo committed Jul 18, 2019
2 parents 7cc64eb + 56f79bb commit ee3ccba
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/ipc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ pub fn bytes_channel() -> Result<(IpcBytesSender, IpcBytesReceiver),Error> {
///
/// [IpcReceiver]: struct.IpcReceiver.html
#[derive(Debug)]
pub struct IpcReceiver<T> where T: for<'de> Deserialize<'de> + Serialize {
pub struct IpcReceiver<T> {
os_receiver: OsIpcReceiver,
phantom: PhantomData<T>,
}
Expand Down Expand Up @@ -216,7 +216,7 @@ impl<T> IpcReceiver<T> where T: for<'de> Deserialize<'de> + Serialize {
}
}

impl<'de, T> Deserialize<'de> for IpcReceiver<T> where T: for<'dde> Deserialize<'dde> + Serialize {
impl<'de, T> Deserialize<'de> for IpcReceiver<T> {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let index: usize = Deserialize::deserialize(deserializer)?;
let os_receiver =
Expand All @@ -232,7 +232,7 @@ impl<'de, T> Deserialize<'de> for IpcReceiver<T> where T: for<'dde> Deserialize<
}
}

impl<T> Serialize for IpcReceiver<T> where T: for<'de> Deserialize<'de> + Serialize {
impl<T> Serialize for IpcReceiver<T> {
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 @@ -267,7 +267,7 @@ impl<T> Serialize for IpcReceiver<T> where T: for<'de> Deserialize<'de> + Serial
/// # assert_eq!(rx_data, data);
/// ```
#[derive(Debug)]
pub struct IpcSender<T> where T: Serialize {
pub struct IpcSender<T> {
os_sender: OsIpcSender,
phantom: PhantomData<T>,
}
Expand Down Expand Up @@ -327,7 +327,7 @@ impl<T> IpcSender<T> where T: Serialize {
}
}

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

impl<T> Serialize for IpcSender<T> where T: Serialize {
impl<T> Serialize for IpcSender<T> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
serialize_os_ipc_sender(&self.os_sender, serializer)
}
Expand Down

0 comments on commit ee3ccba

Please sign in to comment.