Merge upstream

CHANGELOG.md

@@ -1,3 +1,33 @@
+### Unreleased
+
+#### Housekeeping
+
+* Update `amq-protocol`
+
+#### Breaking Changes
+
+* **async:**
+  * Introduce a new `Error` type, replacing occurences of `io::Error` in public APIs ([#145](https://github.com/sozu-proxy/lapin/pull/147))
+* **futures:**
+  * Introduce a new `Error` type, replacing occurences of `io::Error` in public APIs ([#145](https://github.com/sozu-proxy/lapin/pull/145))
+
+### 0.14.1 (2018-11-16)
+
+#### Housekeeping
+
+* Update `env_logger`
+* Drop unused `build.rs` from async
+
+#### Bug Fixes
+
+* Fix heartbeat interval
+### 0.14.0 (2018-10-17)
+
+#### Housekeeping
+
+* Update amq-protocol dependency
+* Reexport `amq_protocol::uri`
+
 ### 0.13.0 (2018-07-09)
 
 #### Features

README.md

@@ -31,7 +31,7 @@ lapin-futures is available on [crates.io](https://crates.io/crates/lapin-futures
 
 ```toml
 [dependencies]
-lapin-futures = "^0.13"
+lapin-futures = "^0.14"
 ```
 
 Then include it in your code like this:
@@ -52,7 +52,7 @@ lapin-async is available on [crates.io](https://crates.io/crates/lapin-async) an
 
 ```toml
 [dependencies]
-lapin-async = "^0.13"
+lapin-async = "^0.14"
 ```
 
 Then include it in your code like this:

async/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lapin-async"
-version = "0.13.0"
+version = "0.15.0"
 authors = ["Geoffroy Couprie <[email protected]>", "Marc-Antoine Perennou <[email protected]>"]
 description = "AMQP client library with a low level API designed for use with mio"
 repository = "https://github.com/sozu-proxy/lapin"
@@ -9,25 +9,20 @@ documentation = "https://docs.rs/lapin-async"
 keywords = ["amqp", "rabbitmq", "mio"]
 categories = ["database"]
 license = "MIT"
-build = "build.rs"
 
 [dependencies]
 log = "^0.4"
 nom = "^4.0"
 cookie-factory = "^0.2.4"
-amq-protocol = "^0.21"
+amq-protocol = "^1.0"
+failure = "^0.1"
 
 [dependencies.sasl]
 version= "^0.4"
 default-features = false
 
-[build-dependencies]
-amq-protocol = "^0.21"
-
 [dev-dependencies]
-env_logger = "^0.5"
+env_logger = "^0.6"
 
 [features]
 default = []
-
-