Merge pull request #139 from JohnTitor/next-macros

macros: Bump up to 0.1.2

actix-connect/CHANGES.md

@@ -1,5 +1,11 @@
 # Changes
 
+## [2.0.0-alpha.3] - 2020-05-08
+
+### Fixed
+
+* Corrected spelling of `ConnectError::Unresolverd` to `ConnectError::Unresolved`
+
 ## [2.0.0-alpha.2] - 2020-03-08
 
 ### Changed

actix-connect/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-connect"
-version = "2.0.0-alpha.2"
+version = "2.0.0-alpha.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix connect - tcp connector service"
 keywords = ["network", "framework", "async", "futures"]

actix-connect/src/connector.rs

@@ -88,7 +88,7 @@ impl<T: Address> Service for TcpConnector<T> {
             Either::Left(TcpConnectorResponse::new(req, port, addr))
         } else {
             error!("TCP connector: got unresolved address");
-            Either::Right(err(ConnectError::Unresolverd))
+            Either::Right(err(ConnectError::Unresolved))
         }
     }
 }

actix-connect/src/error.rs

@@ -18,7 +18,7 @@ pub enum ConnectError {
 
     /// Unresolved host name
     #[display(fmt = "Connector received `Connect` method with unresolved host")]
-    Unresolverd,
+    Unresolved,
 
     /// Connection io error
     #[display(fmt = "{}", _0)]

actix-macros/CHANGES.md

@@ -0,0 +1,9 @@
+# CHANGES
+
+## 0.1.2 - 2020-05-18
+
+### Changed
+
+* Forward actix_rt::test arguments to test function [#127]
+
+[#127]: https://github.com/actix/actix-net/pull/127

actix-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-macros"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix runtime macros"
 repository = "https://github.com/actix/actix-net"
@@ -19,5 +19,5 @@ syn = { version = "^1", features = ["full"] }
 [dev-dependencies]
 actix-rt = "1.0"
 
-futures = "0.3"
+futures-util = { version = "0.3", default-features = false }
 trybuild = "1"

actix-macros/tests/trybuild/main-02-only-async.rs

@@ -1,4 +1,4 @@
 #[actix_rt::main]
 fn main() {
-    futures::future::ready(()).await
+    futures_util::future::ready(()).await
 }

actix-macros/tests/trybuild/main-02-only-async.stderr

@@ -9,6 +9,6 @@ error[E0601]: `main` function not found in crate `$CRATE`
   |
 1 | / #[actix_rt::main]
 2 | | fn main() {
-3 | |     futures::future::ready(()).await
+3 | |     futures_util::future::ready(()).await
 4 | | }
   | |_^ consider adding a `main` function to `$DIR/tests/trybuild/main-02-only-async.rs`