linkerd
/
linkerd2-proxy
mirror of https://github.com/linkerd/linkerd2-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build(deps): Update Rust to v1.53.0 (#1108) 

More info at https://github.com/rust-lang/rust/releases/tag/1.53.0
This commit is contained in:
Oliver Gould 2021-06-18 09:40:40 -07:00 committed by GitHub
parent 0fa39ed802
commit 3290ab19c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/package/Dockerfile vendored
View File

@ -1,4 +1,4 @@
ARG BASE_IMAGE=rust:1.52.1-buster ARG BASE_IMAGE=rust:1.53.0-buster
FROM $BASE_IMAGE FROM $BASE_IMAGE
WORKDIR /linkerd WORKDIR /linkerd
RUN apt-get update && \ RUN apt-get update && \

2
.github/workflows/advisory.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
timeout-minutes: 40 timeout-minutes: 40
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: docker://rust:1.52.1-buster image: docker://rust:1.53.0-buster
permissions: permissions:
contents: read contents: read
strategy: strategy:

2
.github/workflows/coverage.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 30 timeout-minutes: 30
container: container:
image: docker://rust:1.52.1-buster image: docker://rust:1.53.0-buster
options: --security-opt seccomp=unconfined options: --security-opt seccomp=unconfined
steps: steps:
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

6
.github/workflows/rust.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
timeout-minutes: 5 timeout-minutes: 5
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: docker://rust:1.52.1-buster image: docker://rust:1.53.0-buster
permissions: permissions:
contents: read contents: read
steps: steps:
@ -37,7 +37,7 @@ jobs:
timeout-minutes: 20 timeout-minutes: 20
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: docker://rust:1.52.1-buster image: docker://rust:1.53.0-buster
permissions: permissions:
contents: read contents: read
steps: steps:
@ -49,7 +49,7 @@ jobs:
timeout-minutes: 5 timeout-minutes: 5
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: container:
image: docker://rust:1.52.1-buster image: docker://rust:1.53.0-buster
permissions: permissions:
contents: read contents: read
steps: steps:

4
Dockerfile
View File

@ -17,7 +17,7 @@
# :; docker buildx build . --load # :; docker buildx build . --load
# Please make changes via update-rust-version.sh # Please make changes via update-rust-version.sh
ARG RUST_IMAGE=rust:1.52.1-buster ARG RUST_IMAGE=rust:1.53.0-buster
# Use an arbitrary ~recent edge release image to get the proxy # Use an arbitrary ~recent edge release image to get the proxy
# identity-initializing and linkerd-await wrappers. # identity-initializing and linkerd-await wrappers.
@ -41,7 +41,7 @@ RUN --mount=type=cache,target=/var/lib/apt/lists \
WORKDIR /usr/src/linkerd2-proxy WORKDIR /usr/src/linkerd2-proxy
COPY . . COPY . .
RUN --mount=type=cache,target=target \ RUN --mount=type=cache,target=target \
--mount=type=cache,from=rust:1.52.1-buster,source=/usr/local/cargo,target=/usr/local/cargo \ --mount=type=cache,from=rust:1.53.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \
mkdir -p /out && \ mkdir -p /out && \
if [ -n "$PROXY_UNOPTIMIZED" ]; then \ if [ -n "$PROXY_UNOPTIMIZED" ]; then \
(cd linkerd2-proxy && /usr/bin/time -v cargo build --locked --features="$PROXY_FEATURES") && \ (cd linkerd2-proxy && /usr/bin/time -v cargo build --locked --features="$PROXY_FEATURES") && \

2
linkerd/tls/src/lib.rs
View File

@ -39,7 +39,7 @@ impl std::fmt::Debug for NegotiatedProtocol {
} }
impl NegotiatedProtocolRef<'_> { impl NegotiatedProtocolRef<'_> {
pub fn to_owned(&self) -> NegotiatedProtocol { pub fn to_owned(self) -> NegotiatedProtocol {
NegotiatedProtocol(self.0.into()) NegotiatedProtocol(self.0.into())
} }
} }

2
rust-toolchain
View File

@ -1 +1 @@
1.52.1 1.53.0