Rust 1.74

Adds a Rust toolchain file to be less disruptive to developers who don't keep
their toolchain synchronized (by now having rustup automatically synchronize).

Hopefully helps resolve how +nightly clippy may pass for the coordinator, yet
building would fail due to stable's (hopefully prior?) failure to model some
async functions re: Send/Sync.

Also adds rust-src as a component in preparation of
https://github.com/paritytech/polkadot-sdk/pull/2217
This commit is contained in:
Luke Parker 2023-11-19 17:43:43 -05:00
parent 74a8df4c7b
commit 05b975dff9
No known key found for this signature in database
11 changed files with 17 additions and 12 deletions

View file

@ -10,12 +10,12 @@ inputs:
rust-toolchain:
description: "Rust toolchain to install"
required: false
default: 1.73.0
default: 1.74.0
rust-components:
description: "Rust components to install"
required: false
default:
default: rust-src, clippy
runs:
using: "composite"

View file

@ -20,7 +20,7 @@ jobs:
- name: Install cargo
uses: dtolnay/rust-toolchain@5cb429dd810e16ff67df78472fa81cf760f4d1c0
with:
toolchain: 1.73.0
toolchain: 1.74.0
- name: Install cargo deny
run: cargo install --locked cargo-deny

View file

@ -22,7 +22,7 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
rust-toolchain: ${{ steps.nightly.outputs.version }}
rust-components: clippy
rust-components: rust-src, clippy
- name: Run Clippy
run: cargo clippy --all-features --all-targets -- -D warnings -A clippy::items_after_test_module
@ -41,7 +41,7 @@ jobs:
- name: Install cargo
uses: dtolnay/rust-toolchain@5cb429dd810e16ff67df78472fa81cf760f4d1c0
with:
toolchain: 1.73.0
toolchain: 1.74.0
- name: Install cargo deny
run: cargo install --locked cargo-deny

View file

@ -1,4 +1,4 @@
FROM rust:1.73-slim-bookworm as builder
FROM rust:1.74-slim-bookworm as builder
COPY --from=mimalloc libmimalloc.so /usr/lib
RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload

View file

@ -8,7 +8,7 @@ RUN git clone https://github.com/microsoft/mimalloc && \
cmake -DMI_SECURE=ON ../.. && \
make && \
cp ./libmimalloc-secure.so ../../../libmimalloc.so
FROM rust:1.73-slim-bookworm as builder
FROM rust:1.74-slim-bookworm as builder
COPY --from=mimalloc libmimalloc.so /usr/lib
RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload

View file

@ -8,7 +8,7 @@ RUN git clone https://github.com/microsoft/mimalloc && \
cmake -DMI_SECURE=ON ../.. && \
make && \
cp ./libmimalloc-secure.so ../../../libmimalloc.so
FROM rust:1.73-slim-bookworm as builder
FROM rust:1.74-slim-bookworm as builder
COPY --from=mimalloc libmimalloc.so /usr/lib
RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload

View file

@ -8,7 +8,7 @@ RUN git clone https://github.com/microsoft/mimalloc && \
cmake -DMI_SECURE=ON ../.. && \
make && \
cp ./libmimalloc-secure.so ../../../libmimalloc.so
FROM rust:1.73-slim-bookworm as builder
FROM rust:1.74-slim-bookworm as builder
COPY --from=mimalloc libmimalloc.so /usr/lib
RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload

View file

@ -8,7 +8,7 @@ RUN git clone https://github.com/microsoft/mimalloc && \
cmake -DMI_SECURE=ON ../.. && \
make && \
cp ./libmimalloc-secure.so ../../../libmimalloc.so
FROM rust:1.73-slim-bookworm as builder
FROM rust:1.74-slim-bookworm as builder
COPY --from=mimalloc libmimalloc.so /usr/lib
RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload

View file

@ -1,4 +1,4 @@
FROM rust:1.73.0-slim-bookworm as builder
FROM rust:1.74.0-slim-bookworm as builder
# Move to a Debian package snapshot
RUN rm -rf /etc/apt/sources.list.d/debian.sources && \

View file

@ -8,7 +8,7 @@ RUN git clone https://github.com/microsoft/mimalloc && \
cmake -DMI_SECURE=ON ../.. && \
make && \
cp ./libmimalloc-secure.so ../../../libmimalloc.so
FROM rust:1.73-slim-bookworm as builder
FROM rust:1.74-slim-bookworm as builder
COPY --from=mimalloc libmimalloc.so /usr/lib
RUN echo "/usr/lib/libmimalloc.so" >> /etc/ld.so.preload

5
rust-toolchain.toml Normal file
View file

@ -0,0 +1,5 @@
[toolchain]
channel = "1.74"
targets = ["wasm32-unknown-unknown"]
profile = "minimal"
components = ["rust-src", "rustfmt", "clippy"]