dev: v43 with Rust v1.76 (#2703)

linkerd/dev@76df6dc
linkerd · Feb 21, 2024 · f1d5571 · f1d5571
1 parent 098dd0d
commit f1d5571
Show file tree

Hide file tree

Showing 71 changed files with 87 additions and 137 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -3,7 +3,7 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			"DEV_VERSION": "v42",
+			"DEV_VERSION": "v43",
 			"http_proxy": "${localEnv:http_proxy}",
 			"https_proxy": "${localEnv:https_proxy}"
 		}

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v42
+      - uses: linkerd/dev/actions/setup-tools@v43
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just action-lint
 
   devcontainer-versions:
     runs-on: ubuntu-latest
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v42
+      - uses: linkerd/dev/actions/setup-tools@v43
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just action-dev-check
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -22,7 +22,7 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     timeout-minutes: 20
     continue-on-error: true
     steps:

diff --git a/.github/workflows/check-all.yml b/.github/workflows/check-all.yml
@@ -32,7 +32,7 @@ jobs:
   check-all:
     timeout-minutes: 20
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: git config --global --add safe.directory "$PWD" # actions/runner#2033

diff --git a/.github/workflows/check-each.yml b/.github/workflows/check-each.yml
@@ -37,7 +37,7 @@ jobs:
   list-changed-crates:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: docker://ghcr.io/linkerd/dev:v42-rust
+    container: docker://ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: git config --global --add safe.directory "$PWD" # actions/runner#2033
@@ -58,7 +58,7 @@ jobs:
     needs: list-changed-crates
     timeout-minutes: 20
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     strategy:
       matrix:
         crate: ${{ fromJson(needs.list-changed-crates.outputs.crates) }}

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     container:
-      image: docker://ghcr.io/linkerd/dev:v42-rust
+      image: docker://ghcr.io/linkerd/dev:v43-rust
       options: --security-opt seccomp=unconfined # 🤷
     env:
       CXX: "/usr/bin/clang++-14"

diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml
@@ -46,7 +46,7 @@ jobs:
   deprecated:
     timeout-minutes: 20
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: git config --global --add safe.directory "$PWD" # actions/runner#2033

diff --git a/.github/workflows/fuzzers.yml b/.github/workflows/fuzzers.yml
@@ -27,7 +27,7 @@ jobs:
   list-changed:
     timeout-minutes: 3
     runs-on: ubuntu-latest
-    container: docker://rust:1.73.0
+    container: docker://rust:1.76.0
     steps:
       - run: apt update && apt install -y jo
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
@@ -48,7 +48,7 @@ jobs:
     needs: [list-changed]
     timeout-minutes: 40
     runs-on: ubuntu-latest
-    container: docker://rust:1.73.0
+    container: docker://rust:1.76.0
     strategy:
       matrix:
         dir: ${{ fromJson(needs.list-changed.outputs.dirs) }}

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -36,7 +36,7 @@ jobs:
   test:
     timeout-minutes: 20
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: git config --global --add safe.directory "$PWD" # actions/runner#2033

diff --git a/.github/workflows/k8s.yml b/.github/workflows/k8s.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v42
+      - uses: linkerd/dev/actions/setup-tools@v43
 
       - name: Install linkerd CLI (edge)
         id: linkerd

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -21,7 +21,7 @@ jobs:
   clippy:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: git config --global --add safe.directory "$PWD" # actions/runner#2033
@@ -31,7 +31,7 @@ jobs:
   fmt:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: git config --global --add safe.directory "$PWD" # actions/runner#2033
@@ -40,7 +40,7 @@ jobs:
   docs:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: git config --global --add safe.directory "$PWD" # actions/runner#2033

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -22,7 +22,7 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     timeout-minutes: 20
     continue-on-error: true
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -74,7 +74,7 @@ jobs:
     continue-on-error: ${{ !needs.meta.outputs.publish }}
     runs-on: ubuntu-latest
     timeout-minutes: 40
-    container: docker://ghcr.io/linkerd/dev:v42-rust-musl
+    container: docker://ghcr.io/linkerd/dev:v43-rust-musl
     env:
       LINKERD2_PROXY_VENDOR: ${{ github.repository_owner }}
       LINKERD2_PROXY_VERSION: ${{ needs.meta.outputs.version }}

diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
@@ -15,6 +15,6 @@ jobs:
     timeout-minutes: 5
     runs-on: ubuntu-latest
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v42
+      - uses: linkerd/dev/actions/setup-tools@v43
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: just sh-lint
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
   meshtls:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: git config --global --add safe.directory "$PWD" # actions/runner#2033
@@ -43,7 +43,7 @@ jobs:
   unit:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: git config --global --add safe.directory "$PWD" # actions/runner#2033

diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   devcontainer:
     runs-on: ubuntu-latest
-    container: ghcr.io/linkerd/dev:v42-rust
+    container: ghcr.io/linkerd/dev:v43-rust
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - run: git config --global --add safe.directory "$PWD" # actions/runner#2033
@@ -37,7 +37,7 @@ jobs:
   workflows:
     runs-on: ubuntu-latest
     steps:
-      - uses: linkerd/dev/actions/setup-tools@v42
+      - uses: linkerd/dev/actions/setup-tools@v43
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - shell: bash
         run: |

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 # This is intended **DEVELOPMENT ONLY**, i.e. so that proxy developers can
 # easily test the proxy in the context of the larger `linkerd2` project.
 
-ARG RUST_IMAGE=ghcr.io/linkerd/dev:v42-rust
+ARG RUST_IMAGE=ghcr.io/linkerd/dev:v43-rust
 
 # Use an arbitrary ~recent edge release image to get the proxy
 # identity-initializing and linkerd-await wrappers.

diff --git 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
@@ -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
@@ -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
@@ -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/inbound/src/http.rs b/linkerd/app/inbound/src/http.rs
@@ -15,10 +15,7 @@ pub mod fuzz {
     use crate::{
         http::router::Http,
         policy,
-        test_util::{
-            support::{connect::Connect, http_util, profile, resolver},
-            *,
-        },
+        test_util::{support::connect::Connect, *},
         Config, Inbound,
     };
     use hyper::{client::conn::Builder as ClientBuilder, Body, Request, Response};

diff --git 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<hyper::Body>;

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<Vec<u8>>,