Drop unnecessary direct rustls-pki-types dependency

Author: djc

Cargo.lock

@@ -15,7 +15,6 @@ exclude = ["/.github", "/examples", "/scripts"]
 [dependencies]
 tokio = "1.0"
 rustls = { version = "0.23.5", default-features = false, features = ["std"] }
-pki-types = { package = "rustls-pki-types", version = "1" }
 
 [features]
 default = ["logging", "tls12", "aws_lc_rs"]

Cargo.toml

@@ -6,7 +6,7 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use argh::FromArgs;
-use pki_types::ServerName;
+use rustls::pki_types::ServerName;
 use tokio::io::{copy, split, stdin as tokio_stdin, stdout as tokio_stdout, AsyncWriteExt};
 use tokio::net::TcpStream;
 use tokio_rustls::{rustls, TlsConnector};

examples/client.rs

@@ -5,7 +5,7 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
 use argh::FromArgs;
-use pki_types::{CertificateDer, PrivateKeyDer};
+use rustls::pki_types::{CertificateDer, PrivateKeyDer};
 use rustls_pemfile::{certs, private_key};
 use tokio::io::{copy, sink, split, AsyncWriteExt};
 use tokio::net::TcpListener;

examples/server.rs

@@ -5,7 +5,7 @@ use std::task::{Context, Poll};
 
 use futures_util::future::poll_fn;
 use futures_util::task::noop_waker_ref;
-use pki_types::ServerName;
+use rustls::pki_types::ServerName;
 use rustls::{ClientConnection, Connection, ServerConnection};
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadBuf};
 

src/common/test_stream.rs

@@ -48,7 +48,7 @@ use std::task::{Context, Poll};
 
 pub use rustls;
 
-use pki_types::ServerName;
+use rustls::pki_types::ServerName;
 use rustls::server::AcceptedAlert;
 use rustls::{ClientConfig, ClientConnection, CommonState, ServerConfig, ServerConnection};
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};

src/lib.rs

@@ -2,7 +2,7 @@ use std::io;
 use std::net::ToSocketAddrs;
 use std::sync::Arc;
 
-use pki_types::ServerName;
+use rustls::pki_types::ServerName;
 use rustls::ClientConfig;
 use tokio::io::{AsyncReadExt, AsyncWriteExt};
 use tokio::net::TcpStream;

tests/badssl.rs

@@ -8,7 +8,7 @@ use std::task::{Context, Poll};
 use std::thread;
 
 use futures_util::{future::Future, ready};
-use pki_types::ServerName;
+use rustls::pki_types::ServerName;
 use rustls::{self, ClientConfig, ServerConnection, Stream};
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncWriteExt, ReadBuf};
 use tokio::net::TcpStream;

tests/early-data.rs

@@ -7,7 +7,7 @@ use std::{io, thread};
 
 use futures_util::future::TryFutureExt;
 use lazy_static::lazy_static;
-use pki_types::ServerName;
+use rustls::pki_types::ServerName;
 use rustls::ClientConfig;
 use tokio::io::{copy, split, AsyncReadExt, AsyncWriteExt};
 use tokio::net::{TcpListener, TcpStream};