about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-03-04 02:27:56 +0000
committerbors <bors@rust-lang.org>2025-03-04 02:27:56 +0000
commitfd17deacce374a4185c882795be162e17b557050 (patch)
treee1d061404746357b64bbf8bd972d990b89a52203 /src/ci
parent2010bba8868fa714bb4b07be463a8923b26d44db (diff)
parent5d093cb872100367aecebd339c50286608d5f1f8 (diff)
Auto merge of #137959 - matthiaskrgr:rollup-62vjvwr, r=matthiaskrgr
Rollup of 12 pull requests

Successful merges:

 - #135767 (Future incompatibility warning `unsupported_fn_ptr_calling_conventions`: Also warn in dependencies)
 - #137852 (Remove layouting dead code for non-array SIMD types.)
 - #137863 (Fix pretty printing of unsafe binders)
 - #137882 (do not build additional stage on compiler paths)
 - #137894 (Revert "store ScalarPair via memset when one side is undef and the other side can be memset")
 - #137902 (Make `ast::TokenKind` more like `lexer::TokenKind`)
 - #137921 (Subtree update of `rust-analyzer`)
 - #137922 (A few cleanups after the removal of `cfg(not(parallel))`)
 - #137939 (fix order on shl impl)
 - #137946 (Fix docker run-local docs)
 - #137955 (Always allow rustdoc-json tests to contain long lines)
 - #137958 (triagebot.toml: Don't label `test/rustdoc-json` as A-rustdoc-search)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci')
-rw-r--r--src/ci/docker/README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/README.md b/src/ci/docker/README.md
index a1a3a1c37ce..20b6f7d10ef 100644
--- a/src/ci/docker/README.md
+++ b/src/ci/docker/README.md
@@ -11,12 +11,12 @@ the [`jobs.yml`](../github-actions/jobs.yml) file.
 To run a specific CI job locally, you can use the `citool` Rust crate:
 
 ```
-cargo --manifest-path src/ci/citool/Cargo.toml run run-local <job-name>
+cargo run --manifest-path src/ci/citool/Cargo.toml run-local <job-name>
 ```
 
 For example, to run the `x86_64-gnu-llvm-18-1` job:
 ```
-cargo --manifest-path src/ci/citool/Cargo.toml run run-local x86_64-gnu-llvm-18-1
+cargo run --manifest-path src/ci/citool/Cargo.toml run-local x86_64-gnu-llvm-18-1
 ```
 
 The job will output artifacts in an `obj/<image-name>` dir at the root of a repository. Note