1
Fork 0

Rollup 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.
This commit is contained in:
Matthias Krüger 2024-12-30 19:34:56 +01:00 committed by GitHub
commit 4b9e3daa0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 9 additions and 9 deletions

View file

@ -2637,7 +2637,7 @@ fn prepare_cargo_test(
) -> BootstrapCommand { ) -> BootstrapCommand {
let mut cargo = cargo.into(); let mut cargo = cargo.into();
// Propegate `--bless` if it has not already been set/unset // Propagate `--bless` if it has not already been set/unset
// Any tools that want to use this should bless if `RUSTC_BLESS` is set to // Any tools that want to use this should bless if `RUSTC_BLESS` is set to
// anything other than `0`. // anything other than `0`.
if builder.config.cmd.bless() && !cargo.get_envs().any(|v| v.0 == "RUSTC_BLESS") { if builder.config.cmd.bless() && !cargo.get_envs().any(|v| v.0 == "RUSTC_BLESS") {

View file

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

View file

@ -1,7 +1,7 @@
//! Facilitates the management and generation of tarballs. //! Facilitates the management and generation of tarballs.
//! //!
//! Tarballs efficiently hold Rust compiler build artifacts and //! Tarballs efficiently hold Rust compiler build artifacts and
//! capture a snapshot of each boostrap stage. //! capture a snapshot of each bootstrap stage.
//! In uplifting, a tarball from Stage N captures essential components //! In uplifting, a tarball from Stage N captures essential components
//! to assemble Stage N + 1 compiler. //! to assemble Stage N + 1 compiler.

View file

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

View file

@ -8,7 +8,7 @@
//! //!
//! Currently uses a combination of HTML parsing to //! Currently uses a combination of HTML parsing to
//! extract the `href` and `id` attributes, //! extract the `href` and `id` attributes,
//! and regex search on the orignal markdown to handle intra-doc links. //! and regex search on the original markdown to handle intra-doc links.
//! //!
//! These values are then translated to file URLs if possible and then the //! These values are then translated to file URLs if possible and then the
//! destination is asserted to exist. //! destination is asserted to exist.

View file

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

View file

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

View file

@ -33,7 +33,7 @@ fn baz<I: Tr1>(_x: &<I as Tr1<A=Bar>>::A) {}
trait Tr2<T1, T2, T3> { trait Tr2<T1, T2, T3> {
} }
// Test for when wrongly specifed equality constraint's ident // Test for when wrongly specified equality constraint's ident
// matches some generic param's ident // matches some generic param's ident
// (Note: E0229 is emitted only for the first erroneous equality // (Note: E0229 is emitted only for the first erroneous equality
// constraint (T2) not for any subequent ones (e.g. T3)) // constraint (T2) not for any subequent ones (e.g. T3))

View file

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