From d5125bfa5fc621aaad6759b122a82c2b5b9dffbc Mon Sep 17 00:00:00 2001
From: Danny Browning <bdbrowning2@gmail.com>
Date: Tue, 16 Apr 2019 13:11:29 -0600
Subject: [PATCH] Context Changes (#6)

* context changes

* unpin nightly
---
 .travis.yml   |  2 +-
 Cargo.toml    |  6 +++---
 src/server.rs | 13 ++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cd3dd6c..a64e4fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: rust
 rust:
-    - nightly-2019-03-01
+    - nightly
 sudo: false
 cache:
   - apt
diff --git a/Cargo.toml b/Cargo.toml
index 5ce3bac..c1a76a0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2018"
 # When releasing to crates.io:
 # - Update doc URL.
 # - Create "vX.Y.Z" git tag.
-version = "0.4.0"
+version = "0.5.0"
 license = "MIT"
 readme = "README.md"
 description = """
@@ -13,7 +13,7 @@ Share packets between services using servo ipc
 """
 authors = ["Danny Browning <bdbrowning2@gmail.com>"]
 categories = ["asynchronous", "network-programming"]
-documentation = "https://docs.rs/packet-ipc/0.4.0/packet_ipc/"
+documentation = "https://docs.rs/packet-ipc/0.5.0/packet_ipc/"
 repository = "https://github.com/dbcfd/packet-ipc"
 
 [dependencies]
@@ -21,7 +21,7 @@ bincode = "1"
 crossbeam-channel = "0.3"
 failure = "0.1"
 failure_derive = "0.1"
-futures-preview = { version ="0.3.0-alpha.13", features = ["compat"] }
+futures-preview = { version ="0.3.0-alpha.14", features = ["compat"] }
 ipc-channel = "0.11"
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/src/server.rs b/src/server.rs
index 00d9eda..cc865a7 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -5,7 +5,7 @@ use futures::Poll;
 use ipc_channel::ipc::{IpcOneShotServer, IpcSender};
 use log::*;
 use std::pin::Pin;
-use std::task::Waker;
+use std::task::Context;
 
 pub struct Server {
     server: IpcOneShotServer<IpcSender<Option<IpcMessage>>>,
@@ -40,26 +40,25 @@ pub struct ConnectedIpc {
     connection: IpcSender<Option<IpcMessage>>,
 }
 
-impl futures::sink::Sink for ConnectedIpc {
-    type SinkItem = IpcMessage;
+impl futures::sink::Sink<IpcMessage> for ConnectedIpc {
     type SinkError = Error;
 
-    fn poll_ready(self: Pin<&mut Self>, _: &Waker) -> Poll<Result<(), Self::SinkError>> {
+    fn poll_ready(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::SinkError>> {
         Poll::Ready(Ok(()))
     }
 
-    fn start_send(self: Pin<&mut Self>, item: Self::SinkItem) -> Result<(), Self::SinkError> {
+    fn start_send(self: Pin<&mut Self>, item: IpcMessage) -> Result<(), Self::SinkError> {
         self.get_mut().connection.send(Some(item)).map_err(|e| {
             error!("Failed to send {:?}", e);
             Error::Bincode(e)
         })
     }
 
-    fn poll_flush(self: Pin<&mut Self>, _: &Waker) -> Poll<Result<(), Self::SinkError>> {
+    fn poll_flush(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::SinkError>> {
         Poll::Ready(Ok(()))
     }
 
-    fn poll_close(self: Pin<&mut Self>, _: &Waker) -> Poll<Result<(), Self::SinkError>> {
+    fn poll_close(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Result<(), Self::SinkError>> {
         info!("Closing IPC Server");
         Poll::Ready(self.get_mut().connection.send(None).map_err(Error::Bincode))
     }