Skip to content

Commit 5cf5189

Browse files
committed
Auto merge of #134911 - HigherOrderLogic:master, r=onur-ozkan
chore: fix typos This PR fixes typos errors in docstring only, so functionality wise, it should stay the same.
2 parents c156614 + 4c279fb commit 5cf5189

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

src/bootstrap/src/core/build_steps/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2637,7 +2637,7 @@ fn prepare_cargo_test(
26372637
) -> BootstrapCommand {
26382638
let mut cargo = cargo.into();
26392639

2640-
// Propegate `--bless` if it has not already been set/unset
2640+
// Propagate `--bless` if it has not already been set/unset
26412641
// Any tools that want to use this should bless if `RUSTC_BLESS` is set to
26422642
// anything other than `0`.
26432643
if builder.config.cmd.bless() && !cargo.get_envs().any(|v| v.0 == "RUSTC_BLESS") {

src/bootstrap/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1691,7 +1691,7 @@ Executed at: {executed_at}"#,
16911691
}
16921692
}
16931693
if let Ok(()) = fs::hard_link(&src, dst) {
1694-
// Attempt to "easy copy" by creating a hard link (symlinks are priviledged on windows),
1694+
// Attempt to "easy copy" by creating a hard link (symlinks are privileged on windows),
16951695
// but if that fails just fall back to a slow `copy` operation.
16961696
} else {
16971697
if let Err(e) = fs::copy(&src, dst) {

src/bootstrap/src/utils/tarball.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Facilitates the management and generation of tarballs.
22
//!
33
//! Tarballs efficiently hold Rust compiler build artifacts and
4-
//! capture a snapshot of each boostrap stage.
4+
//! capture a snapshot of each bootstrap stage.
55
//! In uplifting, a tarball from Stage N captures essential components
66
//! to assemble Stage N + 1 compiler.
77

src/ci/scripts/install-clang.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LLVM_VERSION="18.1.4"
1515

1616
if isMacOS; then
1717
# FIXME: This is the latest pre-built version of LLVM that's available for
18-
# x86_64 MacOS. We may want to consider bulding our own LLVM binaries
18+
# x86_64 MacOS. We may want to consider building our own LLVM binaries
1919
# instead, or set `USE_XCODE_CLANG` like AArch64 does.
2020
LLVM_VERSION="15.0.7"
2121

src/tools/linkchecker/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//!
99
//! Currently uses a combination of HTML parsing to
1010
//! extract the `href` and `id` attributes,
11-
//! and regex search on the orignal markdown to handle intra-doc links.
11+
//! and regex search on the original markdown to handle intra-doc links.
1212
//!
1313
//! These values are then translated to file URLs if possible and then the
1414
//! destination is asserted to exist.

src/tools/nix-dev-shell/envrc-flake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# If you want to use this as an .envrc file to create a shell with necessery components
1+
# If you want to use this as an .envrc file to create a shell with necessary components
22
# to develop rustc, use the following command in the root of the rusr checkout:
33
#
44
# ln -s ./src/tools/nix-dev-shell/envrc-flake ./.envrc && nix flake update --flake ./src/tools/nix-dev-shell

src/tools/nix-dev-shell/envrc-shell

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# If you want to use this as an .envrc file to create a shell with necessery components
1+
# If you want to use this as an .envrc file to create a shell with necessary components
22
# to develop rustc, use the following command in the root of the rusr checkout:
33
#
44
# ln -s ./src/tools/nix-dev-shell/envrc-shell ./.envrc

tests/ui/associated-types/associated-types-eq-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn baz<I: Tr1>(_x: &<I as Tr1<A=Bar>>::A) {}
3333
trait Tr2<T1, T2, T3> {
3434
}
3535

36-
// Test for when wrongly specifed equality constraint's ident
36+
// Test for when wrongly specified equality constraint's ident
3737
// matches some generic param's ident
3838
// (Note: E0229 is emitted only for the first erroneous equality
3939
// constraint (T2) not for any subequent ones (e.g. T3))

tests/ui/associated-types/project-defer-unification.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ where Pix: Pixel<Subpixel=u8> + 'static,
9393

9494
let mut indices: ImageBuffer<_,Vec<_>> = loop { };
9595
for (pixel, idx) in image.pixels().zip(indices.pixels_mut()) {
96-
// failured occurred here ^^ because we were requiring that we
96+
// failure occurred here ^^ because we were requiring that we
9797
// could project Pixel or Subpixel from `T_indices` (type of
9898
// `indices`), but the type is insufficiently constrained
9999
// until we reach the return below.

0 commit comments

Comments
 (0)