diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2025-08-26 14:19:18 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-26 14:19:18 +1000 |
| commit | 67436ea8cf397159ec81f6c66c994f047c3e385e (patch) | |
| tree | f6f4cb73973a79183560e797e311936bff4d80a1 | |
| parent | 514d6122630d7d52ca0b0ee4c57110e33f6a4adc (diff) | |
| parent | 5d41f7ccb87996b2ca22b4ad42570f65f13c40bc (diff) | |
| download | rust-67436ea8cf397159ec81f6c66c994f047c3e385e.tar.gz rust-67436ea8cf397159ec81f6c66c994f047c3e385e.zip | |
Rollup merge of #145811 - houpo-bob:master, r=samueltardieu
Fix some minor issues in comments Fix some minor issues in comments
| -rw-r--r-- | src/build_helper/src/npm.rs | 2 | ||||
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 8 | ||||
| -rw-r--r-- | src/doc/rustc/src/command-line-arguments/print-options.md | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/build_helper/src/npm.rs b/src/build_helper/src/npm.rs index 86cf6183bd0..5a7df0999bd 100644 --- a/src/build_helper/src/npm.rs +++ b/src/build_helper/src/npm.rs @@ -27,7 +27,7 @@ pub fn install(src_root_path: &Path, out_dir: &Path, npm: &Path) -> Result<PathB } // disable a bunch of things we don't want. // this makes tidy output less noisy, and also significantly improves runtime - // of repeated tidy invokations. + // of repeated tidy invocations. cmd.args(&["--audit=false", "--save=false", "--fund=false"]); cmd.current_dir(out_dir); let exit_status = cmd.spawn()?.wait()?; diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 409d2cba821..35b9456d37d 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -104,10 +104,10 @@ jobs: # These jobs automatically inherit envs.pr, to avoid repeating it in each job # definition. # -# PR CI jobs will be automatically registered as Auto CI jobs or overriden. When +# PR CI jobs will be automatically registered as Auto CI jobs or overridden. When # automatically registered, the PR CI job configuration will be copied as an -# Auto CI job but with `continue_on_error` overriden to `false` (to fail-fast). -# When overriden, `citool` will check for equivalence between the PR and CI job +# Auto CI job but with `continue_on_error` overridden to `false` (to fail-fast). +# When overridden, `citool` will check for equivalence between the PR and CI job # of the same name modulo `continue_on_error` and `env`. pr: - name: pr-check-1 @@ -166,7 +166,7 @@ optional: # # Auto jobs may not specify `continue_on_error: true`, and thus will fail-fast. # -# Unless explicitly overriden, PR CI jobs will be automatically registered as +# Unless explicitly overridden, PR CI jobs will be automatically registered as # Auto CI jobs. auto: ############################# diff --git a/src/doc/rustc/src/command-line-arguments/print-options.md b/src/doc/rustc/src/command-line-arguments/print-options.md index 1f33e91e5d1..fed19d6b667 100644 --- a/src/doc/rustc/src/command-line-arguments/print-options.md +++ b/src/doc/rustc/src/command-line-arguments/print-options.md @@ -32,7 +32,7 @@ The names of the files created by the `link` emit kind. ## `sysroot` -Abosulte path to the sysroot. +Absolute path to the sysroot. Example (with rustup and the stable toolchain): |