Migrate to Rust 2021

Cargo.toml

@@ -14,7 +14,7 @@ documentation = "https://docs.rs/async-rustls"
 readme = "README.md"
 description = "Asynchronous TLS/SSL streams using Rustls."
 categories = ["asynchronous", "cryptography", "network-programming"]
-edition = "2018"
+edition = "2021"
 
 [workspace]
 resolver = "2"

examples/client/Cargo.toml

@@ -2,7 +2,8 @@
 name = "client"
 version = "0.1.0"
 authors = ["quininer <quininer@live.com>", "John Nunley <jtnunley01@gmail.com>"]
-edition = "2018"
+edition = "2021"
+publish = false
 
 [dependencies]
 argh = "0.1"

examples/client/src/main.rs

@@ -5,7 +5,6 @@ use smol::io::{copy, split, AsyncWriteExt};
 use smol::net::TcpStream;
 use smol::prelude::*;
 use smol::Unblock;
-use std::convert::TryFrom;
 use std::fs::File;
 use std::io;
 use std::io::BufReader;

examples/server/Cargo.toml

@@ -2,7 +2,8 @@
 name = "server"
 version = "0.1.0"
 authors = ["quininer <quininer@live.com>", "John Nunley <jtnunley01@gmail.com>"]
-edition = "2018"
+edition = "2021"
+publish = false
 
 [dependencies]
 argh = "0.1"

src/common/test_stream.rs

@@ -256,8 +256,6 @@ fn stream_eof() -> io::Result<()> {
 }
 
 fn make_pair() -> (ServerConnection, ClientConnection) {
-    use std::convert::TryFrom;
-
     let (sconfig, cconfig) = utils::make_configs();
     let server = ServerConnection::new(sconfig).unwrap();
 

tests/badssl.rs

@@ -5,7 +5,6 @@ use async_rustls::{
 };
 use smol::io::{AsyncReadExt, AsyncWriteExt};
 use smol::net::TcpStream;
-use std::convert::TryFrom;
 use std::io;
 use std::net::ToSocketAddrs;
 use std::sync::Arc;

tests/early-data.rs

@@ -9,7 +9,6 @@ use smol::net::TcpStream;
 use smol::prelude::*;
 use smol::Timer;
 use smol::{future, future::Future};
-use std::convert::TryFrom;
 use std::io::{self, BufRead, BufReader, Cursor};
 use std::net::SocketAddr;
 use std::pin::Pin;

tests/test.rs

@@ -6,7 +6,6 @@ use rustls_pemfile::{certs, rsa_private_keys};
 use smol::io::{copy, split, AssertAsync, AsyncReadExt, AsyncWriteExt};
 use smol::net::{TcpListener, TcpStream};
 use smol::prelude::*;
-use std::convert::TryFrom;
 use std::io::{BufReader, Cursor, ErrorKind};
 use std::net::SocketAddr;
 use std::sync::mpsc::channel;