Skip to content

Commit 3125888

Browse files
Merge pull request rust-lang#415 from rust-lang/fix-ci
Fix CI and pin toolchain
2 parents d5dfa72 + fe815f7 commit 3125888

File tree

4 files changed

+8
-34
lines changed

4 files changed

+8
-34
lines changed

.github/workflows/ci.yml

+3-32
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ jobs:
1717

1818
steps:
1919
- uses: actions/checkout@v2
20-
- name: Setup Rust
21-
run: |
22-
rustup update nightly --no-self-update
23-
rustup default nightly
24-
rustup component add rustfmt
2520
- name: Run rustfmt
2621
run: cargo fmt --all -- --check
2722

@@ -51,11 +46,7 @@ jobs:
5146
steps:
5247
- uses: actions/checkout@v2
5348
- name: Setup Rust
54-
run: |
55-
rustup update nightly --no-self-update
56-
rustup default nightly
57-
rustup target add ${{ matrix.target }}
58-
rustup component add clippy
49+
run: rustup target add ${{ matrix.target }}
5950
- name: Run Clippy
6051
run: cargo clippy --all-targets --target ${{ matrix.target }}
6152

@@ -100,10 +91,7 @@ jobs:
10091
steps:
10192
- uses: actions/checkout@v2
10293
- name: Setup Rust
103-
run: |
104-
rustup update nightly --no-self-update
105-
rustup default nightly
106-
rustup target add ${{ matrix.target }}
94+
run: rustup target add ${{ matrix.target }}
10795

10896
- name: Configure RUSTFLAGS
10997
shell: bash
@@ -156,10 +144,6 @@ jobs:
156144
- { name: simd128, RUSTFLAGS: "-C target-feature=+simd128" }
157145
steps:
158146
- uses: actions/checkout@v2
159-
- name: Setup Rust
160-
run: |
161-
rustup update nightly --no-self-update
162-
rustup default nightly
163147
- name: Install wasm-pack
164148
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
165149
- name: Test (debug)
@@ -203,11 +187,7 @@ jobs:
203187
steps:
204188
- uses: actions/checkout@v2
205189
- name: Setup Rust
206-
run: |
207-
rustup update nightly --no-self-update
208-
rustup default nightly
209-
rustup target add ${{ matrix.target }}
210-
rustup component add rust-src
190+
run: rustup target add ${{ matrix.target }}
211191

212192
- name: Install Cross
213193
# Equivalent to `cargo install cross`, but downloading a prebuilt
@@ -259,10 +239,6 @@ jobs:
259239

260240
steps:
261241
- uses: actions/checkout@v2
262-
- name: Setup Rust
263-
run: |
264-
rustup update nightly --no-self-update
265-
rustup default nightly
266242
- name: Detect AVX512
267243
run: echo "CPU_FEATURE=$(lscpu | grep -o avx512[a-z]* | sed s/avx/+avx/ | tr '\n' ',' )" >> $GITHUB_ENV
268244
- name: Check build
@@ -278,10 +254,5 @@ jobs:
278254
runs-on: ubuntu-latest
279255
steps:
280256
- uses: actions/checkout@v2
281-
- name: Setup Rust
282-
run: |
283-
rustup update nightly --no-self-update
284-
rustup default nightly
285-
rustup component add miri rust-src
286257
- name: Test (Miri)
287258
run: cargo miri test

crates/core_simd/src/simd/ptr/const_ptr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub trait SimdConstPtr: Copy + Sealed {
4949
/// non-zero-sized memory accesses with a no-provenance pointer are UB. No-provenance pointers
5050
/// are little more than a usize address in disguise.
5151
///
52-
/// This is different from [`Self::from_exposed_addr`], which creates a pointer that picks up a
52+
/// This is different from [`Self::with_exposed_provenance`], which creates a pointer that picks up a
5353
/// previously exposed provenance.
5454
///
5555
/// Equivalent to calling [`core::ptr::without_provenance`] on each element.

crates/core_simd/src/simd/ptr/mut_ptr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub trait SimdMutPtr: Copy + Sealed {
4646
/// non-zero-sized memory accesses with a no-provenance pointer are UB. No-provenance pointers
4747
/// are little more than a usize address in disguise.
4848
///
49-
/// This is different from [`Self::from_exposed_addr`], which creates a pointer that picks up a
49+
/// This is different from [`Self::with_exposed_provenance`], which creates a pointer that picks up a
5050
/// previously exposed provenance.
5151
///
5252
/// Equivalent to calling [`core::ptr::without_provenance`] on each element.

rust-toolchain.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[toolchain]
2+
channel = "nightly-2024-04-10"
3+
components = ["rustfmt", "clippy", "miri", "rust-src"]

0 commit comments

Comments
 (0)