Merge pull request #415 from rust-lang/fix-ci

Fix CI and pin toolchain
rust-lang · Apr 11, 2024 · 3125888 · 3125888
2 parents d5dfa72 + fe815f7
commit 3125888
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,11 +17,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Rust
-        run: |
-          rustup update nightly --no-self-update
-          rustup default nightly
-          rustup component add rustfmt
       - name: Run rustfmt
         run: cargo fmt --all -- --check
 
@@ -51,11 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup Rust
-        run: |
-          rustup update nightly --no-self-update
-          rustup default nightly
-          rustup target add ${{ matrix.target }}
-          rustup component add clippy
+        run: rustup target add ${{ matrix.target }}
       - name: Run Clippy
         run: cargo clippy --all-targets --target ${{ matrix.target }}
 
@@ -100,10 +91,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup Rust
-        run: |
-          rustup update nightly --no-self-update
-          rustup default nightly
-          rustup target add ${{ matrix.target }}
+        run: rustup target add ${{ matrix.target }}
 
       - name: Configure RUSTFLAGS
         shell: bash
@@ -156,10 +144,6 @@ jobs:
           - { name: simd128, RUSTFLAGS: "-C target-feature=+simd128" }
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Rust
-        run: |
-          rustup update nightly --no-self-update
-          rustup default nightly
       - name: Install wasm-pack
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
       - name: Test (debug)
@@ -203,11 +187,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup Rust
-        run: |
-          rustup update nightly --no-self-update
-          rustup default nightly
-          rustup target add ${{ matrix.target }}
-          rustup component add rust-src
+        run: rustup target add ${{ matrix.target }}
 
       - name: Install Cross
         # Equivalent to `cargo install cross`, but downloading a prebuilt
@@ -259,10 +239,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Rust
-        run: |
-          rustup update nightly --no-self-update
-          rustup default nightly
       - name: Detect AVX512
         run: echo "CPU_FEATURE=$(lscpu | grep -o avx512[a-z]* | sed s/avx/+avx/ | tr '\n' ',' )" >> $GITHUB_ENV
       - name: Check build
@@ -278,10 +254,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Rust
-        run: |
-          rustup update nightly --no-self-update
-          rustup default nightly
-          rustup component add miri rust-src
       - name: Test (Miri)
         run: cargo miri test
diff --git a/crates/core_simd/src/simd/ptr/const_ptr.rs b/crates/core_simd/src/simd/ptr/const_ptr.rs
@@ -49,7 +49,7 @@ pub trait SimdConstPtr: Copy + Sealed {
     /// non-zero-sized memory accesses with a no-provenance pointer are UB. No-provenance pointers
     /// are little more than a usize address in disguise.
     ///
-    /// This is different from [`Self::from_exposed_addr`], which creates a pointer that picks up a
+    /// This is different from [`Self::with_exposed_provenance`], which creates a pointer that picks up a
     /// previously exposed provenance.
     ///
     /// Equivalent to calling [`core::ptr::without_provenance`] on each element.

diff --git a/crates/core_simd/src/simd/ptr/mut_ptr.rs b/crates/core_simd/src/simd/ptr/mut_ptr.rs
@@ -46,7 +46,7 @@ pub trait SimdMutPtr: Copy + Sealed {
     /// non-zero-sized memory accesses with a no-provenance pointer are UB. No-provenance pointers
     /// are little more than a usize address in disguise.
     ///
-    /// This is different from [`Self::from_exposed_addr`], which creates a pointer that picks up a
+    /// This is different from [`Self::with_exposed_provenance`], which creates a pointer that picks up a
     /// previously exposed provenance.
     ///
     /// Equivalent to calling [`core::ptr::without_provenance`] on each element.

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2024-04-10"
+components = ["rustfmt", "clippy", "miri", "rust-src"]