Merge pull request #26 from schani-rs/dependabot/cargo/lapin-futures-…

…0.11.1

Update lapin-futures requirement to 0.11.1

Cargo.toml

@@ -8,8 +8,7 @@ dotenv = "0.11.0"
 env_logger = "0.4.3"
 futures = "0.1.17"
 hyper = "^0.11"
-lapin-async = "*"
-lapin-futures = "0.10.0"
+lapin-futures = "0.11.1"
 log = "0.4.1"
 schani_library_client = { git = "https://github.com/schani-rs/schani_library_client.git" }
 schani_store_client = { git = "https://github.com/schani-rs/schani_store_client.git" }

src/lib.rs

@@ -2,7 +2,6 @@ extern crate dotenv;
 extern crate env_logger;
 extern crate futures;
 extern crate hyper;
-extern crate lapin_async;
 extern crate lapin_futures as lapin;
 #[macro_use]
 extern crate log;
@@ -30,7 +29,7 @@ use futures::Future;
 use hyper::Uri;
 use schani_library_client::{Image, LibraryClient};
 use schani_store_client::StoreClient;
-use lapin_async::queue::Message;
+use lapin::message::Delivery;
 use tokio_core::reactor::Core;
 
 struct Config {
@@ -68,7 +67,7 @@ pub fn run() {
     let lib_client = Arc::new(LibraryClient::new(config.library_uri.clone(), &handle));
     let store_client = Arc::new(StoreClient::new(config.store_uri.clone(), &handle));
 
-    queue::run(&host_addr, core, &|message: Message| {
+    queue::run(&host_addr, core, &|message: Delivery| {
         info!("got message: {:?}", message);
         let image_id = str::from_utf8(&message.data)
             .unwrap()

src/queue/client.rs

@@ -4,7 +4,7 @@ use std::thread;
 
 use futures::{Future, Stream};
 use lapin;
-use lapin_async::queue::Message;
+use lapin::message::Delivery;
 use lapin::client::ConnectionOptions;
 use lapin::types::FieldTable;
 use lapin::channel::{BasicConsumeOptions, QueueDeclareOptions};
@@ -14,7 +14,7 @@ use tokio_core::net::TcpStream;
 pub fn run(
     addr: &net::SocketAddr,
     mut core: Core,
-    fun: &Fn(Message) -> Box<Future<Item = Message, Error = io::Error>>,
+    fun: &Fn(Delivery) -> Box<Future<Item = Delivery, Error = io::Error>>,
 ) {
     let work = TcpStream::connect(addr, &core.handle())
         .and_then(|stream| {