From 8417078ef30557e542fe1109a842c8856e232e44 Mon Sep 17 00:00:00 2001 From: Constantin Nickel Date: Wed, 23 Dec 2020 09:37:43 +0100 Subject: [PATCH] Update to bytes 1.0 --- Cargo.toml | 4 ++-- src/handshake/machine.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6a68a8e..3d23c20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,10 +20,10 @@ tls-vendored = ["native-tls", "native-tls/vendored"] [dependencies] base64 = "0.13.0" byteorder = "1.3.2" -bytes = "0.5" +bytes = "1.0" http = "0.2" httparse = "1.3.4" -input_buffer = "0.3.0" +input_buffer = { version = "0.3.0", git = "https://github.com/nickelc/input_buffer.git", branch = "bytes" } log = "0.4.8" rand = "0.7.2" sha-1 = "0.9" diff --git a/src/handshake/machine.rs b/src/handshake/machine.rs index b8416a6..5c7e000 100644 --- a/src/handshake/machine.rs +++ b/src/handshake/machine.rs @@ -51,7 +51,7 @@ impl HandshakeMachine { .no_block()?; match read { Some(0) => Err(Error::Protocol("Handshake not finished".into())), - Some(_) => Ok(if let Some((size, obj)) = Obj::try_parse(Buf::bytes(&buf))? { + Some(_) => Ok(if let Some((size, obj)) = Obj::try_parse(Buf::chunk(&buf))? { buf.advance(size); RoundResult::StageFinished(StageResult::DoneReading { result: obj, @@ -72,7 +72,7 @@ impl HandshakeMachine { } HandshakeState::Writing(mut buf) => { assert!(buf.has_remaining()); - if let Some(size) = self.stream.write(Buf::bytes(&buf)).no_block()? { + if let Some(size) = self.stream.write(Buf::chunk(&buf)).no_block()? { assert!(size > 0); buf.advance(size); Ok(if buf.has_remaining() {