Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/build_helper/src/npm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()?;
Expand Down
8 changes: 4 additions & 4 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
#############################
Expand Down
2 changes: 1 addition & 1 deletion src/doc/rustc/src/command-line-arguments/print-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -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):

Expand Down
Loading