diff --git a/examples/internal/bogo_shim.rs b/examples/internal/bogo_shim.rs index e5a1f62b79..52eb5d6abd 100644 --- a/examples/internal/bogo_shim.rs +++ b/examples/internal/bogo_shim.rs @@ -4,11 +4,11 @@ // https://boringssl.googlesource.com/boringssl/+/master/ssl/test // -extern crate rustls; -extern crate webpki; -extern crate env_logger; -extern crate base64; -extern crate sct; +use rustls; +use webpki; +use env_logger; +use base64; +use sct; use std::env; use std::process; @@ -187,19 +187,19 @@ impl rustls::ServerCertVerifier for DummyServerAuth { fn verify_server_cert(&self, _roots: &rustls::RootCertStore, _certs: &[rustls::Certificate], - _hostname: webpki::DNSNameRef, + _hostname: webpki::DNSNameRef<'_>, _ocsp: &[u8]) -> Result { Ok(rustls::ServerCertVerified::assertion()) } } struct FixedSignatureSchemeSigningKey { - key: Arc>, + key: Arc>, scheme: rustls::SignatureScheme, } impl rustls::sign::SigningKey for FixedSignatureSchemeSigningKey { - fn choose_scheme(&self, offered: &[rustls::SignatureScheme]) -> Option> { + fn choose_scheme(&self, offered: &[rustls::SignatureScheme]) -> Option> { if offered.contains(&self.scheme) { self.key.choose_scheme(&[self.scheme]) } else { @@ -210,13 +210,13 @@ impl rustls::sign::SigningKey for FixedSignatureSchemeSigningKey { } struct FixedSignatureSchemeServerCertResolver { - resolver: Arc, + resolver: Arc, scheme: rustls::SignatureScheme, } impl rustls::ResolvesServerCert for FixedSignatureSchemeServerCertResolver { fn resolve(&self, - server_name: Option, + server_name: Option>, sigschemes: &[rustls::SignatureScheme]) -> Option { let mut certkey = self.resolver.resolve(server_name, sigschemes)?; certkey.key = Arc::new(Box::new(FixedSignatureSchemeSigningKey { @@ -228,7 +228,7 @@ impl rustls::ResolvesServerCert for FixedSignatureSchemeServerCertResolver { } struct FixedSignatureSchemeClientCertResolver { - resolver: Arc, + resolver: Arc, scheme: rustls::SignatureScheme, } @@ -318,7 +318,7 @@ fn make_server_cfg(opts: &Options) -> Arc { Arc::new(cfg) } -static EMPTY_LOGS: [&sct::Log; 0] = []; +static EMPTY_LOGS: [&sct::Log<'_>; 0] = []; struct ClientCacheWithoutKxHints(Arc); @@ -475,7 +475,7 @@ enum ClientOrServer { } impl Deref for ClientOrServer { - type Target = rustls::Session; + type Target = dyn rustls::Session; fn deref(&self) -> &Self::Target { match &self { diff --git a/examples/tlsclient.rs b/examples/tlsclient.rs index c126134a55..9224189bbe 100644 --- a/examples/tlsclient.rs +++ b/examples/tlsclient.rs @@ -1,7 +1,7 @@ use std::sync::{Arc, Mutex}; use std::process; -extern crate mio; +use mio; use mio::tcp::TcpStream; use std::net::SocketAddr; @@ -11,18 +11,18 @@ use std::fs; use std::collections; use std::io::{Read, Write, BufReader}; -extern crate env_logger; +use env_logger; #[macro_use] extern crate serde_derive; -extern crate docopt; + use docopt::Docopt; -extern crate rustls; -extern crate webpki; -extern crate webpki_roots; -extern crate ct_logs; -extern crate vecio; +use rustls; +use webpki; +use webpki_roots; +use ct_logs; + mod util; use crate::util::WriteVAdapter; @@ -81,7 +81,7 @@ impl io::Read for TlsClient { } impl TlsClient { - fn new(sock: TcpStream, hostname: webpki::DNSNameRef, cfg: Arc) -> TlsClient { + fn new(sock: TcpStream, hostname: webpki::DNSNameRef<'_>, cfg: Arc) -> TlsClient { TlsClient { socket: sock, closing: false, @@ -90,7 +90,7 @@ impl TlsClient { } } - fn read_source_to_end(&mut self, rd: &mut io::Read) -> io::Result { + fn read_source_to_end(&mut self, rd: &mut dyn io::Read) -> io::Result { let mut buf = Vec::new(); let len = rd.read_to_end(&mut buf)?; self.tls_session.write_all(&buf).unwrap(); @@ -425,7 +425,7 @@ mod danger { fn verify_server_cert(&self, _roots: &rustls::RootCertStore, _presented_certs: &[rustls::Certificate], - _dns_name: webpki::DNSNameRef, + _dns_name: webpki::DNSNameRef<'_>, _ocsp: &[u8]) -> Result { Ok(rustls::ServerCertVerified::assertion()) } diff --git a/examples/tlsserver.rs b/examples/tlsserver.rs index 657bdb391d..d52e5f760a 100644 --- a/examples/tlsserver.rs +++ b/examples/tlsserver.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -extern crate mio; +use mio; use mio::tcp::{TcpListener, TcpStream, Shutdown}; #[macro_use] @@ -14,12 +14,12 @@ use std::collections::HashMap; #[macro_use] extern crate serde_derive; -extern crate docopt; + use docopt::Docopt; -extern crate env_logger; -extern crate vecio; -extern crate rustls; +use env_logger; + +use rustls; use rustls::{RootCertStore, Session, NoClientAuth, AllowAnyAuthenticatedClient, AllowAnyAnonymousOrAuthenticatedClient}; diff --git a/examples/util/mod.rs b/examples/util/mod.rs index 175732c8fd..c8a6263d64 100644 --- a/examples/util/mod.rs +++ b/examples/util/mod.rs @@ -4,11 +4,11 @@ use rustls; /// This glues our `rustls::WriteV` trait to `vecio::Rawv`. pub struct WriteVAdapter<'a> { - rawv: &'a mut Rawv + rawv: &'a mut dyn Rawv } impl<'a> WriteVAdapter<'a> { - pub fn new(rawv: &'a mut Rawv) -> WriteVAdapter<'a> { + pub fn new(rawv: &'a mut dyn Rawv) -> WriteVAdapter<'a> { WriteVAdapter { rawv } } }