edition 2018

Author: PeterW-LWL

Cargo.toml

@@ -14,12 +14,13 @@ name = "ws"
 readme = "README.md"
 repository = "https://github.com/housleyjk/ws-rs"
 version = "0.9.1"
+edition = "2018"
 
 [dependencies]
 byteorder = "1.2.1"
 bytes = "0.4.6"
 httparse = "1.2.4"
-log = "0.4.1"
+log = "0.4.8"
 mio = "0.6.14"
 mio-extras = "2.0"
 rand = "0.7"

examples/autobahn-client.rs

@@ -1,5 +1,4 @@
-/// WebSocket client used for testing against the Autobahn Test Suite
-extern crate ws;
+//! WebSocket client used for testing against the Autobahn Test Suite
 
 use std::cell::Cell;
 use std::rc::Rc;

examples/autobahn-server.rs

@@ -1,8 +1,8 @@
-extern crate env_logger;
-/// WebSocket server used for testing against the Autobahn Test Suite. This is basically the server
-/// example without printing output or comments.
-extern crate ws;
+//! WebSocket server used for testing against the Autobahn Test Suite. This is basically the server
+//! example without printing output or comments.
 
+use env_logger;
+use ws;
 #[cfg(feature = "permessage-deflate")]
 use ws::deflate::DeflateHandler;
 

examples/bench-server.rs

@@ -1,5 +1,4 @@
-/// WebSocket server used for testing the bench example.
-extern crate ws;
+//! WebSocket server used for testing the bench example.
 
 use ws::{Builder, Sender, Settings};
 

examples/bench.rs

@@ -1,17 +1,16 @@
-extern crate env_logger;
-extern crate time;
-extern crate url;
-/// A simple, but immature, benchmark client for destroying other WebSocket frameworks and proving
-/// WS-RS's performance excellence. ;)
-/// Make sure you allow for enough connections in your OS (e.g. ulimit -Sn 10000).
-extern crate ws;
+//! A simple, but immature, benchmark client for destroying other WebSocket frameworks and proving
+//! WS-RS's performance excellence. ;)
+//! Make sure you allow for enough connections in your OS (e.g. ulimit -Sn 10000).
 
 // Try this against node for some fun
 
 // TODO: Separate this example into a separate lib
 // TODO: num threads, num connections per thread, num concurrent connections per thread, num
 // messages per connection, length of message, text or binary
 
+use env_logger;
+use time;
+use url;
 use ws::{Builder, CloseCode, Handler, Handshake, Message, Result, Sender, Settings};
 
 const CONNECTIONS: usize = 10_000; // simultaneous

examples/channel.rs

@@ -1,21 +1,20 @@
-extern crate env_logger;
-/// An example of using channels to transfer data between three parts of some system.
-///
-/// A WebSocket server echoes data back to a client and tees that data to a logging system.
-/// A WebSocket client sends some data do the server.
-/// A worker thread stores data as a log and sends that data back to the main program when the
-/// WebSocket server has finished receiving data.
-///
-/// This example demonstrates how to use threads, channels, and WebSocket handlers to create a
-/// complex system from simple, composable parts.
-extern crate ws;
+//! An example of using channels to transfer data between three parts of some system.
+//!
+//! A WebSocket server echoes data back to a client and tees that data to a logging system.
+//! A WebSocket client sends some data do the server.
+//! A worker thread stores data as a log and sends that data back to the main program when the
+//! WebSocket server has finished receiving data.
+//!
+//! This example demonstrates how to use threads, channels, and WebSocket handlers to create a
+//! complex system from simple, composable parts.
 
 use std::sync::mpsc::channel;
 use std::sync::mpsc::Sender as ThreadOut;
 use std::thread;
 use std::thread::sleep;
 use std::time::Duration;
 
+use env_logger;
 use ws::{connect, listen, CloseCode, Handler, Handshake, Message, Result, Sender};
 
 fn main() {

examples/cli.rs

@@ -1,10 +1,6 @@
-extern crate clap;
-extern crate env_logger;
-extern crate term;
-/// Run this cli like this:
-/// cargo run --example server
-/// cargo run --example cli -- ws://127.0.0.1:3012
-extern crate ws;
+//! Run this cli like this:
+//! cargo run --example server
+//! cargo run --example cli -- ws://127.0.0.1:3012
 
 use std::io;
 use std::io::prelude::*;
@@ -13,6 +9,8 @@ use std::sync::mpsc::Sender as TSender;
 use std::thread;
 
 use clap::{App, Arg};
+use env_logger;
+use term;
 use ws::{connect, CloseCode, Error, ErrorKind, Handler, Handshake, Message, Result, Sender};
 
 fn main() {

examples/client.rs

@@ -1,8 +1,7 @@
-extern crate env_logger;
-/// Simple WebSocket client with error handling. It is not necessary to setup logging, but doing
-/// so will allow you to see more details about the connection by using the RUST_LOG env variable.
-extern crate ws;
+//! Simple WebSocket client with error handling. It is not necessary to setup logging, but doing
+//! so will allow you to see more details about the connection by using the RUST_LOG env variable.
 
+use env_logger;
 use ws::{connect, CloseCode};
 
 fn main() {

examples/external_shutdown.rs

@@ -1,9 +1,9 @@
-extern crate ws;
-
 use std::sync::mpsc::channel;
 use std::thread;
 use std::time::Duration;
 
+use ws;
+
 fn main() {
     let (tx, rx) = channel();
 

examples/html_chat.rs

@@ -1,5 +1,5 @@
-/// An example of a chat web application server
-extern crate ws;
+//! An example of a chat web application server
+
 use ws::{listen, Handler, Message, Request, Response, Result, Sender};
 
 // This can be read from a file