Skip to content

Update Rust to v1.57.0 #1420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/package/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=rust:1.56.0-buster
ARG BASE_IMAGE=rust:1.57.0-buster
FROM $BASE_IMAGE
WORKDIR /linkerd
RUN apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 30
container:
image: docker://rust:1.56.0-buster
image: docker://rust:1.57.0-buster
options: --security-opt seccomp=unconfined # 🤷
steps:
- run: apt update && apt install -y cmake clang golang # for boring
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/fast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
timeout-minutes: 10
runs-on: ubuntu-latest
container:
image: docker://rust:1.56.0-buster
image: docker://rust:1.57.0-buster
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
- run: rustup component add clippy
Expand All @@ -31,7 +31,7 @@ jobs:
timeout-minutes: 10
runs-on: ubuntu-latest
container:
image: docker://rust:1.56.0-buster
image: docker://rust:1.57.0-buster
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
- run: rustup component add rustfmt
Expand All @@ -42,7 +42,7 @@ jobs:
timeout-minutes: 10
runs-on: ubuntu-latest
container:
image: docker://rust:1.56.0-buster
image: docker://rust:1.57.0-buster
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
- run: |
Expand All @@ -56,7 +56,7 @@ jobs:
timeout-minutes: 10
runs-on: ubuntu-latest
container:
image: docker://rust:1.56.0-buster
image: docker://rust:1.57.0-buster
steps:
- run: apt update && apt install -y cmake clang golang # for boring
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
timeout-minutes: 10
runs-on: ubuntu-latest
container:
image: docker://rust:1.56.0-buster
image: docker://rust:1.57.0-buster
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
- run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fuzzers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
timeout-minutes: 40
runs-on: ubuntu-latest
container:
image: docker://rust:1.56.0-buster
image: docker://rust:1.57.0-buster
strategy:
matrix:
dir:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/slow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
timeout-minutes: 20
runs-on: ubuntu-latest
container:
image: docker://rust:1.56.0-buster
image: docker://rust:1.57.0-buster
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
- run: |
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
timeout-minutes: 20
runs-on: ubuntu-latest
container:
image: docker://rust:1.56.0-buster
image: docker://rust:1.57.0-buster
steps:
- uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
- run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# :; docker buildx build . --load

# Please make changes via update-rust-version.sh
ARG RUST_IMAGE=rust:1.56.0-buster
ARG RUST_IMAGE=rust:1.57.0-buster

# Use an arbitrary ~recent edge release image to get the proxy
# identity-initializing and linkerd-await wrappers.
Expand Down Expand Up @@ -47,7 +47,7 @@ RUN --mount=type=cache,target=/var/lib/apt/lists \
WORKDIR /usr/src/linkerd2-proxy
COPY . .
RUN --mount=type=cache,target=target \
--mount=type=cache,from=rust:1.56.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \
--mount=type=cache,from=rust:1.57.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \
mkdir -p /out && \
if [ -n "$PROXY_UNOPTIMIZED" ]; then \
(cd linkerd2-proxy && /usr/bin/time -v cargo build --locked --no-default-features --features="$PROXY_FEATURES") && \
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/inbound/src/policy/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::collections::{HashMap, HashSet};
#[derive(Clone, Debug)]
pub enum Config {
Discover {
control: control::Config,
control: Box<control::Config>,
workload: String,
default: DefaultPolicy,
ports: HashSet<u16>,
Expand Down
1 change: 1 addition & 0 deletions linkerd/app/integration/src/controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ pub struct RouteBuilder {
route: pb::Route,
}

#[allow(clippy::large_enum_variant)]
#[derive(Debug)]
enum Dst {
Call(pb::GetDestination, Result<DstReceiver, grpc::Status>),
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/src/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ pub fn parse_config<S: Strings>(strings: &S) -> Result<super::Config, EnvError>
default,
ports,
workload,
control,
control: Box::new(control),
}
}

Expand Down
6 changes: 3 additions & 3 deletions linkerd/duplex/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ where
type Output = io::Result<()>;

fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> io::Poll<()> {
let mut this = self.project();
let this = self.project();
// This purposefully ignores the Async part, since we don't want to
// return early if the first half isn't ready, but the other half
// could make progress.
trace!("poll");
let _ = this.half_in.copy_into(&mut this.half_out, cx)?;
let _ = this.half_out.copy_into(&mut this.half_in, cx)?;
let _ = this.half_in.copy_into(this.half_out, cx)?;
let _ = this.half_out.copy_into(this.half_in, cx)?;
if this.half_in.is_done() && this.half_out.is_done() {
Poll::Ready(Ok(()))
} else {
Expand Down
2 changes: 1 addition & 1 deletion linkerd/meshtls/boring/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ where

debug!(
tls = io.0.ssl().version_str(),
srv.cert = ?io.0.ssl().certificate().as_deref().and_then(super::fingerprint),
srv.cert = ?io.0.ssl().certificate().and_then(super::fingerprint),
peer.cert = ?io.0.ssl().peer_certificate().as_deref().and_then(super::fingerprint),
client.id = ?client_id,
alpn = ?negotiated_protocol,
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.56.0
1.57.0