Rename cargos.sh back to cargo.sh

.github/workflows/ci.yml

@@ -109,8 +109,8 @@ jobs:
         #
         # ...to:
         #
-        #   toolchain: $ {{ ./cargos.sh --version matrix.toolchain }} # hypothetical syntax
-        ZC_TOOLCHAIN="$(./cargos.sh --version ${{ matrix.toolchain }})"
+        #   toolchain: $ {{ ./cargo.sh --version matrix.toolchain }} # hypothetical syntax
+        ZC_TOOLCHAIN="$(./cargo.sh --version ${{ matrix.toolchain }})"
         echo "Found that the '${{ matrix.toolchain }}' toolchain is $ZC_TOOLCHAIN" | tee -a $GITHUB_STEP_SUMMARY
         echo "ZC_TOOLCHAIN=$ZC_TOOLCHAIN" >> $GITHUB_ENV
 
@@ -125,12 +125,12 @@ jobs:
         fi
 
     # On our MSRV, `cargo` does not know about the `rust-version` field. As a
-    # result, in `cargos.sh`, if we use our MSRV toolchain in order to run `cargo
+    # result, in `cargo.sh`, if we use our MSRV toolchain in order to run `cargo
     # metadata`, we will not be able to extract the `rust-version` field. Thus,
-    # in `cargos.sh`, we explicitly do `cargo +stable metadata`. This requires a
+    # in `cargo.sh`, we explicitly do `cargo +stable metadata`. This requires a
     # (more recent) stable toolchain to be installed. As of this writing, this
     # toolchain is not used for anything else.
-    - name: Install stable Rust for use in 'cargos.sh'
+    - name: Install stable Rust for use in 'cargo.sh'
       uses: dtolnay/rust-toolchain@00b49be78f40fba4e87296b2ead62868750bdd83 # stable
       with:
         toolchain: stable
@@ -158,10 +158,10 @@ jobs:
         key: "${{ matrix.target }}"
 
     - name: Check tests
-      run: ./cargos.sh +${{ matrix.toolchain }} check --tests --package ${{ matrix.crate }} --target ${{ matrix.target }} ${{ matrix.features }} --verbose
+      run: ./cargo.sh +${{ matrix.toolchain }} check --tests --package ${{ matrix.crate }} --target ${{ matrix.target }} ${{ matrix.features }} --verbose
 
     - name: Build
-      run: ./cargos.sh +${{ matrix.toolchain }} build --package ${{ matrix.crate }} --target ${{ matrix.target }} ${{ matrix.features }} --verbose
+      run: ./cargo.sh +${{ matrix.toolchain }} build --package ${{ matrix.crate }} --target ${{ matrix.target }} ${{ matrix.features }} --verbose
 
     # When building tests for the i686 target, we need certain libraries which
     # are not installed by default; `gcc-multilib` includes these libraries.
@@ -180,7 +180,7 @@ jobs:
 
     - name: Run tests
       run: |
-        ./cargos.sh +${{ matrix.toolchain }} test \
+        ./cargo.sh +${{ matrix.toolchain }} test \
           --package ${{ matrix.crate }} \
           --target ${{ matrix.target }} \
           ${{ matrix.features }} \
@@ -206,7 +206,7 @@ jobs:
         #
         # TODO(#560), TODO(#187): Once we migrate to the ui-test crate, we
         # likely won't have to special-case the UI tests like this.
-        RUSTFLAGS="$RUSTFLAGS -Wwarnings" ./cargos.sh +${{ matrix.toolchain }} test \
+        RUSTFLAGS="$RUSTFLAGS -Wwarnings" ./cargo.sh +${{ matrix.toolchain }} test \
           --package ${{ matrix.crate }} \
           --target ${{ matrix.target }} \
           ${{ matrix.features }} \
@@ -242,7 +242,7 @@ jobs:
         # Run under both the stacked borrows model (default) and under the tree 
         # borrows model to ensure we're compliant with both.
         for EXTRA_FLAGS in "" "-Zmiri-tree-borrows"; do
-          MIRIFLAGS="$MIRIFLAGS $EXTRA_FLAGS" ./cargos.sh +${{ matrix.toolchain }} \
+          MIRIFLAGS="$MIRIFLAGS $EXTRA_FLAGS" ./cargo.sh +${{ matrix.toolchain }} \
             miri test \
             --package ${{ matrix.crate }} \
             --target ${{ matrix.target }} \
@@ -256,7 +256,7 @@ jobs:
       if: matrix.toolchain == 'nightly' && matrix.target != 'riscv64gc-unknown-linux-gnu' && matrix.target != 'wasm32-wasi'
 
     - name: Clippy check
-      run: ./cargos.sh +${{ matrix.toolchain }} clippy --package ${{ matrix.crate }} --target ${{ matrix.target }} ${{ matrix.features }} --tests --verbose
+      run: ./cargo.sh +${{ matrix.toolchain }} clippy --package ${{ matrix.crate }} --target ${{ matrix.target }} ${{ matrix.features }} --tests --verbose
       # Clippy improves the accuracy of lints over time, and fixes bugs. Only
       # running Clippy on nightly allows us to avoid having to write code which
       # is compatible with older versions of Clippy, which sometimes requires
@@ -275,7 +275,7 @@ jobs:
         METADATA_DOCS_RS_RUSTDOC_ARGS="$(cargo metadata --format-version 1 | \
           jq -r ".packages[] | select(.name == \"zerocopy\").metadata.docs.rs.\"rustdoc-args\".[]" | tr '\n' ' ')"
         export RUSTDOCFLAGS="${{ matrix.toolchain == 'nightly' && '-Z unstable-options --document-hidden-items' || '' }} $RUSTDOCFLAGS $METADATA_DOCS_RS_RUSTDOC_ARGS"
-        ./cargos.sh +${{ matrix.toolchain }} doc --document-private-items --package ${{ matrix.crate }} ${{ matrix.features }}
+        ./cargo.sh +${{ matrix.toolchain }} doc --document-private-items --package ${{ matrix.crate }} ${{ matrix.features }}
 
     # Check semver compatibility with the most recently-published version on
     # crates.io. We do this in the matrix rather than in its own job so that it

INTERNAL.md

@@ -29,7 +29,7 @@ Updating the versions pinned in CI may cause the UI tests to break. In order to
 fix UI tests after a version update, run:
 
 ```
-$ TRYBUILD=overwrite ./cargos.sh +all test
+$ TRYBUILD=overwrite ./cargo.sh +all test
 ```
 
 ## Crate versions