Skip to content

Commit 1cff3ae

Browse files
authored
1 parent 5ab3951 commit 1cff3ae

File tree

69 files changed

+41
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+41
-93
lines changed

.github/actions/package/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BASE_IMAGE=rust:1.53.0-buster
1+
ARG BASE_IMAGE=rust:1.54.0-buster
22
FROM $BASE_IMAGE
33
WORKDIR /linkerd
44
RUN apt-get update && \

.github/workflows/advisory.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
timeout-minutes: 40
2525
runs-on: ubuntu-latest
2626
container:
27-
image: docker://rust:1.53.0-buster
27+
image: docker://rust:1.54.0-buster
2828
permissions:
2929
contents: read
3030
strategy:

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
timeout-minutes: 30
1515
container:
16-
image: docker://rust:1.53.0-buster
16+
image: docker://rust:1.54.0-buster
1717
options: --security-opt seccomp=unconfined
1818
steps:
1919
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

.github/workflows/rust.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
timeout-minutes: 5
2525
runs-on: ubuntu-latest
2626
container:
27-
image: docker://rust:1.53.0-buster
27+
image: docker://rust:1.54.0-buster
2828
permissions:
2929
contents: read
3030
steps:
@@ -37,7 +37,7 @@ jobs:
3737
timeout-minutes: 20
3838
runs-on: ubuntu-latest
3939
container:
40-
image: docker://rust:1.53.0-buster
40+
image: docker://rust:1.54.0-buster
4141
permissions:
4242
contents: read
4343
steps:
@@ -49,7 +49,7 @@ jobs:
4949
timeout-minutes: 5
5050
runs-on: ubuntu-latest
5151
container:
52-
image: docker://rust:1.53.0-buster
52+
image: docker://rust:1.54.0-buster
5353
permissions:
5454
contents: read
5555
steps:

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# :; docker buildx build . --load
1818

1919
# Please make changes via update-rust-version.sh
20-
ARG RUST_IMAGE=rust:1.53.0-buster
20+
ARG RUST_IMAGE=rust:1.54.0-buster
2121

2222
# Use an arbitrary ~recent edge release image to get the proxy
2323
# identity-initializing and linkerd-await wrappers.
@@ -41,7 +41,7 @@ RUN --mount=type=cache,target=/var/lib/apt/lists \
4141
WORKDIR /usr/src/linkerd2-proxy
4242
COPY . .
4343
RUN --mount=type=cache,target=target \
44-
--mount=type=cache,from=rust:1.53.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \
44+
--mount=type=cache,from=rust:1.54.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \
4545
mkdir -p /out && \
4646
if [ -n "$PROXY_UNOPTIMIZED" ]; then \
4747
(cd linkerd2-proxy && /usr/bin/time -v cargo build --locked --features="$PROXY_FEATURES") && \

hyper-balance/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![deny(warnings, rust_2018_idioms)]
22
#![forbid(unsafe_code)]
3-
#![allow(clippy::inconsistent_struct_constructor)]
43

54
use hyper::body::HttpBody;
65
use pin_project::pin_project;

linkerd/addr/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![deny(warnings, rust_2018_idioms)]
22
#![forbid(unsafe_code)]
3-
#![allow(clippy::inconsistent_struct_constructor)]
43
use linkerd_dns_name::Name;
54
use std::{
65
fmt,

linkerd/app/core/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
1010
#![deny(warnings, rust_2018_idioms)]
1111
#![forbid(unsafe_code)]
12-
#![allow(clippy::inconsistent_struct_constructor)]
1312

1413
pub use drain;
1514
pub use linkerd_addr::{self as addr, Addr, NameAddr};

linkerd/app/core/src/retry.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ impl RetryPolicy {
7070
// only if the request contains a `content-length` header and the
7171
// content length is >= 64 kb.
7272
let has_body = !req.body().is_end_stream();
73-
if has_body && content_length(&req).unwrap_or(usize::MAX) > MAX_BUFFERED_BYTES {
73+
if has_body && content_length(req).unwrap_or(usize::MAX) > MAX_BUFFERED_BYTES {
7474
tracing::trace!(
7575
req.has_body = has_body,
76-
req.content_length = ?content_length(&req),
76+
req.content_length = ?content_length(req),
7777
"not retryable",
7878
);
7979
return false;
8080
}
8181

8282
tracing::trace!(
8383
req.has_body = has_body,
84-
req.content_length = ?content_length(&req),
84+
req.content_length = ?content_length(req),
8585
"retryable",
8686
);
8787
true
@@ -123,7 +123,7 @@ where
123123
}
124124

125125
fn clone_request(&self, req: &http::Request<A>) -> Option<http::Request<A>> {
126-
let can_retry = self.can_retry(&req);
126+
let can_retry = self.can_retry(req);
127127
debug_assert!(
128128
can_retry,
129129
"The retry policy attempted to clone an un-retryable request. This is unexpected."

linkerd/app/gateway/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![deny(warnings, rust_2018_idioms)]
22
#![forbid(unsafe_code)]
3-
#![allow(clippy::inconsistent_struct_constructor)]
43

54
mod gateway;
65
#[cfg(test)]

0 commit comments

Comments
 (0)