Skip to content

Commit af92c6a

Browse files
authored
Rollup merge of #110429 - jsoref:spelling-src-bootstrap, r=albertlarsan68
Spelling src bootstrap The various src/* items seem slightly disparate, so I'm doing src/* individually. split from #110392
2 parents 73bfa18 + 70ce74e commit af92c6a

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

src/bootstrap/bootstrap.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ def fix_bin_or_dylib(self, fname):
575575
]
576576
patchelf_args = ["--set-rpath", ":".join(rpath_entries)]
577577
if not fname.endswith(".so"):
578-
# Finally, set the corret .interp for binaries
578+
# Finally, set the correct .interp for binaries
579579
with open("{}/nix-support/dynamic-linker".format(nix_deps_dir)) as dynamic_linker:
580580
patchelf_args += ["--set-interpreter", dynamic_linker.read().rstrip()]
581581

src/bootstrap/builder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ impl<'a> Builder<'a> {
13991399

14001400
// Add extra cfg not defined in/by rustc
14011401
//
1402-
// Note: Altrough it would seems that "-Zunstable-options" to `rustflags` is useless as
1402+
// Note: Although it would seems that "-Zunstable-options" to `rustflags` is useless as
14031403
// cargo would implicitly add it, it was discover that sometimes bootstrap only use
14041404
// `rustflags` without `cargo` making it required.
14051405
rustflags.arg("-Zunstable-options");

src/bootstrap/channel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub enum GitInfo {
2222
/// If the info should be used (`omit_git_hash` is false), this will be
2323
/// `Some`, otherwise it will be `None`.
2424
Present(Option<Info>),
25-
/// This is not a git repostory, but the info can be fetched from the
25+
/// This is not a git repository, but the info can be fetched from the
2626
/// `git-commit-info` file.
2727
RecordedForTarball(Info),
2828
}

src/bootstrap/llvm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ impl Step for Libunwind {
11531153
run.builder.ensure(Libunwind { target: run.target });
11541154
}
11551155

1156-
/// Build linunwind.a
1156+
/// Build libunwind.a
11571157
fn run(self, builder: &Builder<'_>) -> Self::Output {
11581158
builder.update_submodule(&Path::new("src/llvm-project"));
11591159

src/bootstrap/render_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! This module renders the JSON output of libtest into a human-readable form, trying to be as
22
//! similar to libtest's native output as possible.
33
//!
4-
//! This is needed because we need to use libtest in JSON mode to extract granluar information
4+
//! This is needed because we need to use libtest in JSON mode to extract granular information
55
//! about the executed tests. Doing so suppresses the human-readable output, and (compared to Cargo
66
//! and rustc) libtest doesn't include the rendered human-readable output as a JSON field. We had
77
//! to reimplement all the rendering logic in this module because of that.

src/bootstrap/sanity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ pub fn check(build: &mut Build) {
100100
Couldn't find required command: cmake
101101
102102
You should install cmake, or set `download-ci-llvm = true` in the
103-
`[llvm]` section section of `config.toml` to download LLVM rather
103+
`[llvm]` section of `config.toml` to download LLVM rather
104104
than building it.
105105
"
106106
);

0 commit comments

Comments
 (0)