From 457f71bf33cb1090572e6b945ed2443aafb169fc Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Wed, 21 Feb 2024 19:04:35 +0000 Subject: [PATCH] fixes for nightly clippy --- linkerd/addr/src/addr_match.rs | 2 +- linkerd/app/admin/src/server/readiness.rs | 2 +- linkerd/app/gateway/src/http.rs | 5 +---- linkerd/app/inbound/src/direct.rs | 2 +- linkerd/app/integration/src/client.rs | 3 --- linkerd/app/integration/src/controller.rs | 5 +---- linkerd/app/integration/src/identity.rs | 3 +-- linkerd/app/integration/src/lib.rs | 5 ++--- linkerd/app/integration/src/metrics.rs | 1 - linkerd/app/integration/src/policy.rs | 3 +-- linkerd/app/integration/src/proxy.rs | 5 +---- linkerd/app/integration/src/server.rs | 9 +-------- linkerd/app/integration/src/tcp.rs | 5 ----- .../outbound/src/http/handle_proxy_error_headers.rs | 1 - linkerd/app/outbound/src/tcp/endpoint.rs | 11 ++--------- linkerd/app/outbound/src/tcp/tagged_transport.rs | 1 - linkerd/duplex/src/lib.rs | 2 ++ linkerd/identity/src/lib.rs | 1 - linkerd/metrics/src/fmt.rs | 2 +- linkerd/proxy/core/src/resolve.rs | 1 - linkerd/proxy/dns-resolve/src/lib.rs | 2 +- linkerd/proxy/http/src/classify/channel.rs | 1 - linkerd/proxy/http/src/h1.rs | 2 +- linkerd/proxy/http/src/h2.rs | 1 - linkerd/proxy/http/src/orig_proto.rs | 3 +-- linkerd/proxy/http/src/override_authority.rs | 2 +- linkerd/proxy/resolve/src/recover.rs | 4 +--- linkerd/proxy/server-policy/src/authz.rs | 2 +- linkerd/proxy/tap/src/grpc/match_.rs | 2 +- linkerd/proxy/tap/src/grpc/server.rs | 1 - linkerd/proxy/tcp/src/forward.rs | 1 - linkerd/reconnect/src/lib.rs | 2 +- linkerd/router/src/lib.rs | 2 +- linkerd/service-profiles/src/default.rs | 2 +- linkerd/service-profiles/src/http/proxy.rs | 2 +- linkerd/system/src/linux.rs | 2 +- linkerd/tls/src/client.rs | 1 - linkerd/trace-context/src/lib.rs | 1 - linkerd/trace-context/src/service.rs | 1 - 39 files changed, 28 insertions(+), 75 deletions(-) diff --git a/linkerd/addr/src/addr_match.rs b/linkerd/addr/src/addr_match.rs index 29a6231d86..4f1a3c1976 100644 --- a/linkerd/addr/src/addr_match.rs +++ b/linkerd/addr/src/addr_match.rs @@ -1,7 +1,7 @@ use crate::Addr; use ipnet::IpNet; use linkerd_dns_name::{Name, Suffix}; -use std::{fmt, iter::FromIterator, net::IpAddr, sync::Arc}; +use std::{fmt, net::IpAddr, sync::Arc}; #[derive(Clone, Debug, Default)] pub struct AddrMatch { diff --git a/linkerd/app/admin/src/server/readiness.rs b/linkerd/app/admin/src/server/readiness.rs index 917fecef19..77e59e0b54 100644 --- a/linkerd/app/admin/src/server/readiness.rs +++ b/linkerd/app/admin/src/server/readiness.rs @@ -8,7 +8,7 @@ pub struct Readiness(Weak<()>); /// When all latches are dropped, the process is considered ready. #[derive(Clone, Debug)] -pub struct Latch(Arc<()>); +pub struct Latch(#[allow(dead_code)] Arc<()>); impl Readiness { pub fn new() -> (Readiness, Latch) { diff --git a/linkerd/app/gateway/src/http.rs b/linkerd/app/gateway/src/http.rs index ee2ff8a163..6a462cd84e 100644 --- a/linkerd/app/gateway/src/http.rs +++ b/linkerd/app/gateway/src/http.rs @@ -14,10 +14,7 @@ use linkerd_app_core::{ }; use linkerd_app_inbound as inbound; use linkerd_app_outbound as outbound; -use std::{ - cmp::{Eq, PartialEq}, - fmt::Debug, -}; +use std::fmt::Debug; use tokio::sync::watch; mod gateway; diff --git a/linkerd/app/inbound/src/direct.rs b/linkerd/app/inbound/src/direct.rs index 479bc5095b..5025556ffd 100644 --- a/linkerd/app/inbound/src/direct.rs +++ b/linkerd/app/inbound/src/direct.rs @@ -11,7 +11,7 @@ use linkerd_app_core::{ transport_header::{self, NewTransportHeaderServer, SessionProtocol, TransportHeader}, Conditional, Error, Infallible, NameAddr, Result, }; -use std::{convert::TryFrom, fmt::Debug}; +use std::fmt::Debug; use thiserror::Error; use tracing::{debug_span, info_span}; diff --git a/linkerd/app/integration/src/client.rs b/linkerd/app/integration/src/client.rs index 1b9aaf871f..146f7ba1e7 100644 --- a/linkerd/app/integration/src/client.rs +++ b/linkerd/app/integration/src/client.rs @@ -2,13 +2,10 @@ use super::*; use linkerd_app_core::proxy::http::trace; use parking_lot::Mutex; use std::io; -use std::{convert::TryFrom, sync::Arc}; use tokio::net::TcpStream; -use tokio::sync::{mpsc, oneshot}; use tokio::task::JoinHandle; use tokio_rustls::rustls::{self, ClientConfig}; use tracing::info_span; -use tracing::instrument::Instrument; type ClientError = hyper::Error; type Request = http::Request; diff --git a/linkerd/app/integration/src/controller.rs b/linkerd/app/integration/src/controller.rs index f2c5b74692..831f8541c1 100644 --- a/linkerd/app/integration/src/controller.rs +++ b/linkerd/app/integration/src/controller.rs @@ -4,14 +4,11 @@ pub use linkerd2_proxy_api::destination as pb; use linkerd2_proxy_api::net; use linkerd_app_core::proxy::http::trace; use parking_lot::Mutex; -use std::collections::{HashMap, VecDeque}; +use std::collections::VecDeque; use std::net::IpAddr; use std::ops::{Bound, RangeBounds}; -use std::sync::Arc; -use tokio::sync::mpsc; use tokio_stream::wrappers::UnboundedReceiverStream; use tonic as grpc; -use tracing::instrument::Instrument; pub fn new() -> Controller { Controller::new() diff --git a/linkerd/app/integration/src/identity.rs b/linkerd/app/integration/src/identity.rs index 94bff0cdb5..f2ba49766c 100644 --- a/linkerd/app/integration/src/identity.rs +++ b/linkerd/app/integration/src/identity.rs @@ -4,8 +4,7 @@ use std::{ collections::VecDeque, fs, io, path::{Path, PathBuf}, - sync::Arc, - time::{Duration, SystemTime}, + time::SystemTime, }; use linkerd2_proxy_api::identity as pb; diff --git a/linkerd/app/integration/src/lib.rs b/linkerd/app/integration/src/lib.rs index c28959607e..671fa69e7e 100644 --- a/linkerd/app/integration/src/lib.rs +++ b/linkerd/app/integration/src/lib.rs @@ -23,9 +23,8 @@ mod tests; pub use self::test_env::TestEnv; pub use bytes::{Buf, BufMut, Bytes}; -pub use futures::{future, FutureExt, TryFuture, TryFutureExt}; - pub use futures::stream::{Stream, StreamExt}; +pub use futures::{future, FutureExt, TryFuture, TryFutureExt}; pub use http::{HeaderMap, Request, Response, StatusCode}; pub use http_body::Body as HttpBody; pub use linkerd_app as app; @@ -43,7 +42,7 @@ use std::task::{Context, Poll}; pub use std::time::Duration; pub use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, ReadBuf}; use tokio::net::TcpListener; -pub use tokio::sync::oneshot; +pub use tokio::sync::{mpsc, oneshot}; pub use tonic as grpc; pub use tower::Service; diff --git a/linkerd/app/integration/src/metrics.rs b/linkerd/app/integration/src/metrics.rs index 401c6b53a9..7faa8a4759 100644 --- a/linkerd/app/integration/src/metrics.rs +++ b/linkerd/app/integration/src/metrics.rs @@ -1,6 +1,5 @@ use std::collections::HashMap; use std::fmt; -use std::string::ToString; #[derive(Debug, Clone)] pub struct MetricMatch { diff --git a/linkerd/app/integration/src/policy.rs b/linkerd/app/integration/src/policy.rs index 004baa2efc..14760ded14 100644 --- a/linkerd/app/integration/src/policy.rs +++ b/linkerd/app/integration/src/policy.rs @@ -4,8 +4,7 @@ use api::{inbound::inbound_server_policies_server, outbound::outbound_policies_s use futures::stream; use linkerd2_proxy_api as api; use parking_lot::Mutex; -use std::{collections::VecDeque, sync::Arc, time::Duration}; -use tokio::sync::mpsc; +use std::collections::VecDeque; use tokio_stream::wrappers::UnboundedReceiverStream; use tonic as grpc; diff --git a/linkerd/app/integration/src/proxy.rs b/linkerd/app/integration/src/proxy.rs index bb3c73f45c..dda62e4e92 100644 --- a/linkerd/app/integration/src/proxy.rs +++ b/linkerd/app/integration/src/proxy.rs @@ -5,11 +5,8 @@ use linkerd_app_core::{ transport::{listen, orig_dst, Keepalive, ListenAddr}, Result, }; -use std::{ - collections::HashSet, fmt, future::Future, net::SocketAddr, pin::Pin, task::Poll, thread, -}; +use std::{collections::HashSet, thread}; use tokio::net::TcpStream; -use tracing::instrument::Instrument; pub fn new() -> Proxy { Proxy::default() diff --git a/linkerd/app/integration/src/server.rs b/linkerd/app/integration/src/server.rs index fb20d3e3ae..70017727ab 100644 --- a/linkerd/app/integration/src/server.rs +++ b/linkerd/app/integration/src/server.rs @@ -1,18 +1,11 @@ use super::*; -use futures::TryFuture; use linkerd_app_core::proxy::http::trace; use std::{ - collections::HashMap, - future::Future, io, - pin::Pin, sync::atomic::{AtomicUsize, Ordering}, - sync::Arc, - task::{Context, Poll}, }; -use tokio::{net::TcpStream, sync::oneshot, task::JoinHandle}; +use tokio::{net::TcpStream, task::JoinHandle}; use tokio_rustls::{rustls::ServerConfig, TlsAcceptor}; -use tracing::instrument::Instrument; pub fn new() -> Server { http2() diff --git a/linkerd/app/integration/src/tcp.rs b/linkerd/app/integration/src/tcp.rs index 66857df615..ff487f8ad4 100644 --- a/linkerd/app/integration/src/tcp.rs +++ b/linkerd/app/integration/src/tcp.rs @@ -2,14 +2,9 @@ use super::*; use std::collections::VecDeque; use std::io; use std::net::TcpListener as StdTcpListener; -use std::pin::Pin; use std::sync::atomic::{AtomicUsize, Ordering}; -use std::sync::Arc; -use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::net::TcpStream; -use tokio::sync::{mpsc, oneshot}; use tokio::task::JoinHandle; -use tracing::instrument::Instrument; type TcpConnSender = mpsc::UnboundedSender<( Option>, diff --git a/linkerd/app/outbound/src/http/handle_proxy_error_headers.rs b/linkerd/app/outbound/src/http/handle_proxy_error_headers.rs index 6f03f51325..7d85460d3e 100644 --- a/linkerd/app/outbound/src/http/handle_proxy_error_headers.rs +++ b/linkerd/app/outbound/src/http/handle_proxy_error_headers.rs @@ -5,7 +5,6 @@ use linkerd_app_core::{ svc, tls, }; use std::{ - future::Future, pin::Pin, task::{Context, Poll}, }; diff --git a/linkerd/app/outbound/src/tcp/endpoint.rs b/linkerd/app/outbound/src/tcp/endpoint.rs index 51ad0ac4ac..3a9c6a8dd3 100644 --- a/linkerd/app/outbound/src/tcp/endpoint.rs +++ b/linkerd/app/outbound/src/tcp/endpoint.rs @@ -1,13 +1,6 @@ use super::{tagged_transport::TaggedTransport, *}; -use crate::{ConnectMeta, Outbound}; -use linkerd_app_core::{ - io, - proxy::http, - svc, tls, - transport::{self, ClientAddr, Local, Remote, ServerAddr}, - transport_header::SessionProtocol, - Error, -}; +use crate::ConnectMeta; +use linkerd_app_core::{proxy::http, tls, transport_header::SessionProtocol}; impl Outbound { pub fn push_tcp_endpoint( diff --git a/linkerd/app/outbound/src/tcp/tagged_transport.rs b/linkerd/app/outbound/src/tcp/tagged_transport.rs index a1ddcfb1c3..0c4baf41ef 100644 --- a/linkerd/app/outbound/src/tcp/tagged_transport.rs +++ b/linkerd/app/outbound/src/tcp/tagged_transport.rs @@ -9,7 +9,6 @@ use linkerd_app_core::{ Conditional, Error, Result, }; use std::{ - future::Future, pin::Pin, str::FromStr, task::{Context, Poll}, diff --git a/linkerd/duplex/src/lib.rs b/linkerd/duplex/src/lib.rs index e016dbb353..c61c4a57c7 100644 --- a/linkerd/duplex/src/lib.rs +++ b/linkerd/duplex/src/lib.rs @@ -48,12 +48,14 @@ struct CopyBuf { write_pos: usize, } +#[allow(dead_code)] enum Buffered { NotEmpty, Read(usize), Eof, } +#[allow(dead_code)] enum Drained { BufferEmpty, Partial(usize), diff --git a/linkerd/identity/src/lib.rs b/linkerd/identity/src/lib.rs index d240c5f0ce..adbca7b010 100644 --- a/linkerd/identity/src/lib.rs +++ b/linkerd/identity/src/lib.rs @@ -5,7 +5,6 @@ mod credentials; mod metrics; use linkerd_error::{Error, Result}; -use std::convert::From; use std::str::FromStr; pub use self::{ diff --git a/linkerd/metrics/src/fmt.rs b/linkerd/metrics/src/fmt.rs index 16bc4ada4f..7ded04ed29 100644 --- a/linkerd/metrics/src/fmt.rs +++ b/linkerd/metrics/src/fmt.rs @@ -1,5 +1,5 @@ use std::fmt; -use std::marker::{PhantomData, Sized}; +use std::marker::PhantomData; /// Writes a block of metrics in prometheus-formatted output. pub trait FmtMetrics { diff --git a/linkerd/proxy/core/src/resolve.rs b/linkerd/proxy/core/src/resolve.rs index b88b5a1bb3..ec897035cd 100644 --- a/linkerd/proxy/core/src/resolve.rs +++ b/linkerd/proxy/core/src/resolve.rs @@ -2,7 +2,6 @@ use futures::prelude::*; use linkerd_error::Error; use std::{ fmt::Debug, - future::Future, net::SocketAddr, task::{Context, Poll}, }; diff --git a/linkerd/proxy/dns-resolve/src/lib.rs b/linkerd/proxy/dns-resolve/src/lib.rs index 15ba0c86d0..c69bec4376 100644 --- a/linkerd/proxy/dns-resolve/src/lib.rs +++ b/linkerd/proxy/dns-resolve/src/lib.rs @@ -1,7 +1,7 @@ #![deny(rust_2018_idioms, clippy::disallowed_methods, clippy::disallowed_types)] #![forbid(unsafe_code)] -use futures::{future, prelude::*, stream}; +use futures::prelude::*; use linkerd_addr::{Addr, NameAddr}; use linkerd_dns as dns; use linkerd_error::Error; diff --git a/linkerd/proxy/http/src/classify/channel.rs b/linkerd/proxy/http/src/classify/channel.rs index b025e4a270..d881cf11a6 100644 --- a/linkerd/proxy/http/src/classify/channel.rs +++ b/linkerd/proxy/http/src/classify/channel.rs @@ -5,7 +5,6 @@ use linkerd_stack::{layer, ExtractParam, NewService, Service}; use pin_project::{pin_project, pinned_drop}; use std::{ fmt::Debug, - future::Future, marker::PhantomData, pin::Pin, task::{Context, Poll}, diff --git a/linkerd/proxy/http/src/h1.rs b/linkerd/proxy/http/src/h1.rs index ee5d3c89fa..b1d00223f3 100644 --- a/linkerd/proxy/http/src/h1.rs +++ b/linkerd/proxy/http/src/h1.rs @@ -10,7 +10,7 @@ use http::{ use linkerd_error::{Error, Result}; use linkerd_http_box::BoxBody; use linkerd_stack::MakeConnection; -use std::{future::Future, mem, pin::Pin, time::Duration}; +use std::{mem, pin::Pin, time::Duration}; use tracing::{debug, trace}; #[derive(Copy, Clone, Debug)] diff --git a/linkerd/proxy/http/src/h2.rs b/linkerd/proxy/http/src/h2.rs index 6f67098f1e..778c37609a 100644 --- a/linkerd/proxy/http/src/h2.rs +++ b/linkerd/proxy/http/src/h2.rs @@ -8,7 +8,6 @@ use hyper::{ use linkerd_error::{Error, Result}; use linkerd_stack::{MakeConnection, Service}; use std::{ - future::Future, marker::PhantomData, pin::Pin, task::{Context, Poll}, diff --git a/linkerd/proxy/http/src/orig_proto.rs b/linkerd/proxy/http/src/orig_proto.rs index 048797dc3a..858b7a8431 100644 --- a/linkerd/proxy/http/src/orig_proto.rs +++ b/linkerd/proxy/http/src/orig_proto.rs @@ -1,12 +1,11 @@ use super::{h1, h2, upgrade}; -use futures::{future, prelude::*}; +use futures::prelude::*; use http::header::{HeaderValue, TRANSFER_ENCODING}; use hyper::body::HttpBody; use linkerd_error::{Error, Result}; use linkerd_http_box::BoxBody; use linkerd_stack::{layer, MakeConnection, Service}; use std::{ - future::Future, pin::Pin, task::{Context, Poll}, }; diff --git a/linkerd/proxy/http/src/override_authority.rs b/linkerd/proxy/http/src/override_authority.rs index 25c3ac5bbd..39da735b3e 100644 --- a/linkerd/proxy/http/src/override_authority.rs +++ b/linkerd/proxy/http/src/override_authority.rs @@ -1,5 +1,5 @@ use super::h1; -use http::{self, header::AsHeaderName, uri::Authority}; +use http::{header::AsHeaderName, uri::Authority}; use linkerd_stack::{layer, NewService, Param}; use std::{ fmt, diff --git a/linkerd/proxy/resolve/src/recover.rs b/linkerd/proxy/resolve/src/recover.rs index fb0f980e68..885c845f67 100644 --- a/linkerd/proxy/resolve/src/recover.rs +++ b/linkerd/proxy/resolve/src/recover.rs @@ -1,11 +1,9 @@ //! A middleware that recovers a resolution after some failures. -use futures::stream::TryStream; -use futures::{prelude::*, ready, FutureExt, Stream}; +use futures::{prelude::*, ready}; use linkerd_error::{Error, Recover}; use linkerd_proxy_core::resolve::{self, Update}; use pin_project::pin_project; -use std::future::Future; use std::pin::Pin; use std::task::{Context, Poll}; use thiserror::Error; diff --git a/linkerd/proxy/server-policy/src/authz.rs b/linkerd/proxy/server-policy/src/authz.rs index e2222bf4e7..459c5ac9b2 100644 --- a/linkerd/proxy/server-policy/src/authz.rs +++ b/linkerd/proxy/server-policy/src/authz.rs @@ -56,7 +56,7 @@ impl Suffix { #[cfg(feature = "proto")] pub mod proto { use super::*; - use crate::{authz::Network, meta::proto::InvalidMeta}; + use crate::meta::proto::InvalidMeta; use linkerd2_proxy_api::{inbound as api, net::InvalidIpNetwork}; #[derive(Debug, thiserror::Error)] diff --git a/linkerd/proxy/tap/src/grpc/match_.rs b/linkerd/proxy/tap/src/grpc/match_.rs index 3042def496..e1fb8fc32a 100644 --- a/linkerd/proxy/tap/src/grpc/match_.rs +++ b/linkerd/proxy/tap/src/grpc/match_.rs @@ -2,7 +2,7 @@ use crate::Inspect; use ipnet::{Ipv4Net, Ipv6Net}; use linkerd2_proxy_api::net::ip_address; use linkerd2_proxy_api::tap::observe_request; -use std::{boxed::Box, collections::BTreeMap, net, str::FromStr}; +use std::{collections::BTreeMap, net, str::FromStr}; use thiserror::Error; #[derive(Clone, Debug)] diff --git a/linkerd/proxy/tap/src/grpc/server.rs b/linkerd/proxy/tap/src/grpc/server.rs index 892c40539a..77e6a64c49 100644 --- a/linkerd/proxy/tap/src/grpc/server.rs +++ b/linkerd/proxy/tap/src/grpc/server.rs @@ -8,7 +8,6 @@ use linkerd_conditional::Conditional; use linkerd_proxy_http::HasH2Reason; use linkerd_tls as tls; use pin_project::pin_project; -use std::convert::TryFrom; use std::iter; use std::pin::Pin; use std::sync::atomic::{AtomicUsize, Ordering}; diff --git a/linkerd/proxy/tcp/src/forward.rs b/linkerd/proxy/tcp/src/forward.rs index 462f7906bf..ee7228ff16 100644 --- a/linkerd/proxy/tcp/src/forward.rs +++ b/linkerd/proxy/tcp/src/forward.rs @@ -3,7 +3,6 @@ use linkerd_duplex::Duplex; use linkerd_error::{Error, Result}; use linkerd_stack::layer; use std::{ - future::Future, pin::Pin, task::{Context, Poll}, }; diff --git a/linkerd/reconnect/src/lib.rs b/linkerd/reconnect/src/lib.rs index 40a3de0f41..e1dabebd8b 100644 --- a/linkerd/reconnect/src/lib.rs +++ b/linkerd/reconnect/src/lib.rs @@ -5,7 +5,7 @@ #[cfg(test)] mod tests; -use futures::{future, prelude::*, ready}; +use futures::{prelude::*, ready}; use linkerd_error::{Error, Recover}; use linkerd_stack::{layer, NewService, Service}; use std::task::{Context, Poll}; diff --git a/linkerd/router/src/lib.rs b/linkerd/router/src/lib.rs index 324539628b..39be0ee5f9 100644 --- a/linkerd/router/src/lib.rs +++ b/linkerd/router/src/lib.rs @@ -1,7 +1,7 @@ #![deny(rust_2018_idioms, clippy::disallowed_methods, clippy::disallowed_types)] #![forbid(unsafe_code)] -use futures::{future, prelude::*}; +use futures::prelude::*; use linkerd_error::Error; use linkerd_stack::{layer, ExtractParam, NewService, Oneshot, Service, ServiceExt}; use std::{ diff --git a/linkerd/service-profiles/src/default.rs b/linkerd/service-profiles/src/default.rs index 66ef39fae9..c80a01f8de 100644 --- a/linkerd/service-profiles/src/default.rs +++ b/linkerd/service-profiles/src/default.rs @@ -1,5 +1,5 @@ use crate::{GetProfile, LookupAddr, Receiver}; -use futures::{future, prelude::*}; +use futures::prelude::*; use linkerd_error::Error; use std::task::{Context, Poll}; use tracing::debug; diff --git a/linkerd/service-profiles/src/http/proxy.rs b/linkerd/service-profiles/src/http/proxy.rs index a4607d28fd..09ed44db7c 100644 --- a/linkerd/service-profiles/src/http/proxy.rs +++ b/linkerd/service-profiles/src/http/proxy.rs @@ -1,6 +1,6 @@ use super::{RequestMatch, Route}; use crate::{Profile, Receiver, ReceiverStream}; -use futures::{future, prelude::*}; +use futures::prelude::*; use linkerd_error::{Error, Result}; use linkerd_stack::{layer, NewService, Param, Proxy, Service}; use std::{ diff --git a/linkerd/system/src/linux.rs b/linkerd/system/src/linux.rs index d8a27a9544..80f5e1060c 100644 --- a/linkerd/system/src/linux.rs +++ b/linkerd/system/src/linux.rs @@ -1,4 +1,4 @@ -use libc::{self, pid_t}; +use libc::pid_t; use procfs::{ process::{self, LimitValue, Process}, ProcResult, diff --git a/linkerd/tls/src/client.rs b/linkerd/tls/src/client.rs index 74a1434c1d..ca07551208 100644 --- a/linkerd/tls/src/client.rs +++ b/linkerd/tls/src/client.rs @@ -6,7 +6,6 @@ use linkerd_io as io; use linkerd_stack::{layer, MakeConnection, NewService, Oneshot, Param, Service, ServiceExt}; use std::{ fmt, - future::Future, ops::Deref, pin::Pin, str::FromStr, diff --git a/linkerd/trace-context/src/lib.rs b/linkerd/trace-context/src/lib.rs index 74f71df394..ed8c36017c 100644 --- a/linkerd/trace-context/src/lib.rs +++ b/linkerd/trace-context/src/lib.rs @@ -9,7 +9,6 @@ use bytes::Bytes; use linkerd_error::Error; use rand::Rng; use std::collections::HashMap; -use std::convert::TryFrom; use std::fmt; use std::time::SystemTime; use thiserror::Error; diff --git a/linkerd/trace-context/src/service.rs b/linkerd/trace-context/src/service.rs index b4ebd482d5..310509b303 100644 --- a/linkerd/trace-context/src/service.rs +++ b/linkerd/trace-context/src/service.rs @@ -3,7 +3,6 @@ use futures::{future::Either, prelude::*}; use linkerd_stack::layer; use std::{ collections::HashMap, - future::Future, pin::Pin, task::{Context, Poll}, time::SystemTime,