Tidy up

Cargo.toml

@@ -16,7 +16,7 @@ edition = "2018"
 default = ["tls"]
 tls = ["native-tls"]
 tls-vendored = ["native-tls", "native-tls/vendored"]
-deflate = []
+deflate = ["flate2"]
 
 [dependencies]
 base64 = "0.12.0"
@@ -30,7 +30,12 @@ rand = "0.7.2"
 sha-1 = "0.9"
 url = "2.1.0"
 utf-8 = "0.7.5"
-flate2 = { version = "1.0", features = ["zlib"], default-features = false }
+
+[dependencies.flate2]
+optional = true
+version = "1.0"
+default-features = false
+features = ["zlib"]
 
 [dependencies.native-tls]
 optional = true

examples/autobahn-client.rs

@@ -6,7 +6,7 @@ use tungstenite::extensions::deflate::{DeflateConfigBuilder, DeflateExt};
 use tungstenite::protocol::WebSocketConfig;
 use tungstenite::{connect, Error, Message, Result};
 
-const AGENT: &str = "Tungstenite-final-comp-slice";
+const AGENT: &str = "Tungstenite";
 
 fn get_case_count() -> Result<u32> {
     let (mut socket, _) = connect(Url::parse("ws://localhost:9001/getCaseCount").unwrap())?;

fuzz/fuzz_targets/read_message_client.rs

@@ -6,6 +6,7 @@ use std::io;
 use std::io::Cursor;
 use tungstenite::WebSocket;
 use tungstenite::protocol::Role;
+use tungstenite::extensions::uncompressed::UncompressedExt;
 //use std::result::Result;
 
 // FIXME: copypasted from tungstenite's protocol/mod.rs
@@ -32,6 +33,7 @@ impl<Stream: io::Read> io::Read for WriteMoc<Stream> {
 fuzz_target!(|data: &[u8]| {
     //let vector: Vec<u8> = data.into();
     let cursor = Cursor::new(data);
-    let mut socket = WebSocket::from_raw_socket(WriteMoc(cursor), Role::Client, None);
+    let mut socket: WebSocket<_, UncompressedExt> =
+        WebSocket::from_raw_socket(WriteMoc(cursor), Role::Client, None);
     socket.read_message().ok();
-});
+});

fuzz/fuzz_targets/read_message_server.rs

@@ -7,6 +7,7 @@ use std::io;
 use std::io::Cursor;
 use tungstenite::protocol::Role;
 use tungstenite::WebSocket;
+use tungstenite::extensions::uncompressed::UncompressedExt;
 //use std::result::Result;
 
 // FIXME: copypasted from tungstenite's protocol/mod.rs
@@ -33,6 +34,7 @@ impl<Stream: io::Read> io::Read for WriteMoc<Stream> {
 fuzz_target!(|data: &[u8]| {
     //let vector: Vec<u8> = data.into();
     let cursor = Cursor::new(data);
-    let mut socket = WebSocket::from_raw_socket(WriteMoc(cursor), Role::Server, None);
+    let mut socket: WebSocket<_, UncompressedExt> =
+        WebSocket::from_raw_socket(WriteMoc(cursor), Role::Server, None);
     socket.read_message().ok();
 });

src/protocol/frame/mod.rs

@@ -187,7 +187,6 @@ impl FrameCodec {
         frame
             .format(&mut self.out_buffer)
             .expect("Bug: can't write to vector");
-
         self.write_pending(stream)
     }