From 292aed360ce843fd92971db605a51ac0c02b1d0e Mon Sep 17 00:00:00 2001
From: Sameer Puri <sameer@users.noreply.github.com>
Date: Fri, 11 Oct 2019 15:29:11 -0500
Subject: Upgrade actix to v1, bump ipfs-api to v0.5.2

---
 ipfs-api/src/lib.rs | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'ipfs-api/src/lib.rs')

diff --git a/ipfs-api/src/lib.rs b/ipfs-api/src/lib.rs
index 09914d6..e0bf0b4 100644
--- a/ipfs-api/src/lib.rs
+++ b/ipfs-api/src/lib.rs
@@ -56,11 +56,11 @@
 //! #### With Actix
 //!
 //! ```no_run
-//! # extern crate actix_web;
+//! # extern crate actix_rt;
 //! # extern crate futures;
 //! # extern crate ipfs_api;
 //! #
-//! use futures::future::Future;
+//! use futures::future::{Future, lazy};
 //! use ipfs_api::IpfsClient;
 //! use std::io::Cursor;
 //!
@@ -75,12 +75,11 @@
 //!     })
 //!     .map_err(|e| eprintln!("{}", e));
 //!
-//! actix_web::actix::run(|| {
-//!     req.then(|_| {
-//!         actix_web::actix::System::current().stop();
+//! actix_rt::System::new("test").block_on(lazy(|| {
+//!     req.and_then(|_| {
 //!         Ok(())
 //!     })
-//! });
+//! }));
 //! # }
 //! ```
 //!
@@ -119,10 +118,10 @@
 //!
 //! ```no_run
 //! # extern crate futures;
-//! # extern crate actix_web;
+//! # extern crate actix_rt;
 //! # extern crate ipfs_api;
 //! #
-//! use futures::{Future, Stream};
+//! use futures::{Future, lazy, Stream};
 //! use ipfs_api::IpfsClient;
 //! use std::io::{self, Write};
 //!
@@ -140,12 +139,11 @@
 //!     })
 //!     .map_err(|e| eprintln!("{}", e));
 //!
-//! actix_web::actix::run(|| {
-//!     req.then(|_| {
-//!         actix_web::actix::System::current().stop();
+//! actix_rt::System::new("test").block_on(lazy(|| {
+//!     req.and_then(|_| {
 //!         Ok(())
 //!     })
-//! });
+//! }));
 //! # }
 //! ```
 //!
@@ -173,10 +171,12 @@
 //! ```
 //!
 
+#[cfg(feature = "actix")]
+extern crate actix_http;
 #[cfg(feature = "actix")]
 extern crate actix_multipart_rfc7578 as actix_multipart;
 #[cfg(feature = "actix")]
-extern crate actix_web;
+extern crate awc;
 
 #[cfg(feature = "hyper")]
 extern crate hyper;
@@ -186,7 +186,11 @@ extern crate hyper_multipart_rfc7578 as hyper_multipart;
 extern crate hyper_tls;
 
 extern crate bytes;
+#[cfg(feature = "actix")]
 #[macro_use]
+extern crate derive_more;
+#[macro_use]
+#[cfg(feature = "hyper")]
 extern crate failure;
 extern crate futures;
 extern crate http;
-- 
cgit v1.2.3