Merge pull request #3176 from scop/spelling

Spelling and grammar fixes

Author: rbtcollins

CHANGELOG.md

@@ -134,7 +134,7 @@ Thanks go to:
 
 ## [1.24.3] - 2021-05-31
 
-This patch release focusses around resolving some regressions in behaviour in
+This patch release focuses around resolving some regressions in behaviour in
 the 1.24.x series. One problem, related to accounting for the release of data
 blocks in the unpack slab allocator, fixed in [pr#2779], would manifest in the
 installer [hanging during installation][issue#2774]. A second, fixed in
@@ -430,7 +430,7 @@ subsequently `1.48.1` were released, a `rustup update` would update your `1.48`
 from `1.48.0` to `1.48.1`.
 
 As always, there were more changes than described below, thanks to everyone
-who contributed to this release. Hilights for this release are detailed below,
+who contributed to this release. Highlights for this release are detailed below,
 but you can always see the full list of changes via the Git repository.
 
 ### Added
@@ -1315,7 +1315,7 @@ Tryzelaar, Ricardo Martins, Артём Павлов [Artyom Pavlov]
 - [Add PATH in post-install message when not modifying PATH](https://github.com/rust-lang/rustup/pull/1126)
 - [Cleanup download-related code in the rustup_dist crate](https://github.com/rust-lang/rustup/pull/1131)
 - [Increase Rust detection timeout to 3 seconds](https://github.com/rust-lang/rustup/pull/1130)
-- [Supress confusing NotADirectory error and show override missing](https://github.com/rust-lang/rustup/pull/1128)
+- [Suppress confusing NotADirectory error and show override missing](https://github.com/rust-lang/rustup/pull/1128)
 - [Don't try to update archive toolchains](https://github.com/rust-lang/rustup/pull/1121)
 - [Exit successfully on "update not yet available"](https://github.com/rust-lang/rustup/pull/1120)
 - [Add a message when removing a component](https://github.com/rust-lang/rustup/pull/1119)

CONTRIBUTING.md

@@ -181,7 +181,7 @@ Rustup is distributed. The steps for a release are:
 ### `RUSTUP_FORCE_ARG0`
 
 The environment variable `RUSTUP_FORCE_ARG0` can be used to get rustup to think
-its a particular binary, rather than e.g. copying it, symlinking it or other
+it's a particular binary, rather than e.g. copying it, symlinking it or other
 tricks with exec. This is handy when testing particular code paths from cargo
 run.
 

ci/actions-templates/README.md

@@ -12,15 +12,15 @@ Rustup has five situations in which we perform CI builds:
 4. Pushes to the stable branch
 5. Renovate branches with dependency updates, tested before opening a PR or
    merging. They are assessed the same as a PR: if it would be good enough as a
-   human proposed change, its good enough as a robot proposed change.
+   human proposed change, it's good enough as a robot proposed change.
 
 The goals for each of those situations are subtly different. For PR changes,
 we want to know as quickly as possible if the change is likely to be an issue.
 
 Once a change hits master, we want to know that all our targets build.
 
 Time based rebuilds of master are about determining if updates to the toolchain
-have caused us problems, and also to try and hilight if we have flaky tests.
+have caused us problems, and also to try and highlight if we have flaky tests.
 
 The stable branch is about making releases. Builds from that branch are uploaded
 to S3 so that we can then make a release of rustup.

doc/src/environment-variables.md

@@ -35,7 +35,7 @@
   `RUST_BACKTRACE` is set.
 
 - `RUSTUP_PERMIT_COPY_RENAME` *unstable* When set, allows rustup to fall-back
-  to copying files if attempts to `rename` result in an cross-device link
+  to copying files if attempts to `rename` result in cross-device link
   errors. These errors occur on OverlayFS, which is used by [Docker][dc]. This
   feature sacrifices some transactions protections and may be removed at any
   point. Linux only.

src/cli/self_update/windows.rs

@@ -457,7 +457,7 @@ fn _remove_from_path(old_path: Vec<u16>, path_str: Vec<u16>) -> Option<Vec<u16>>
         .position(|path| path == path_str)?;
     // If there's a trailing semicolon (likely, since we probably added one
     // during install), include that in the substring to remove. We don't search
-    // for that to find the string, because if its the last string in the path,
+    // for that to find the string, because if it's the last string in the path,
     // there may not be.
     let mut len = path_str.len();
     if old_path.get(idx + path_str.len()) == Some(&(b';' as u16)) {

src/diskio/mod.rs

@@ -298,7 +298,7 @@ pub(crate) trait Executor {
         self.dispatch(item)
     }
 
-    /// Actually dispatch a operation.
+    /// Actually dispatch an operation.
     /// This is called by the default execute() implementation and
     /// should not be called directly.
     fn dispatch(&self, item: Item) -> Box<dyn Iterator<Item = CompletedIo> + '_>;

tests/dist.rs

@@ -860,7 +860,7 @@ fn unavailable_component_from_profile() {
 
 #[test]
 fn removed_component() {
-    // On day 1 install the 'bonus' component, on day 2 its no longer a component
+    // On day 1 install the 'bonus' component, on day 2 it's no longer a component
     let edit = &|date: &str, chan: &mut MockChannel| {
         if date == "2016-02-01" {
             let tpkg = chan.packages[0]

tests/mock/clitools.rs

@@ -99,7 +99,7 @@ pub fn setup(s: Scenario, f: &dyn Fn(&mut Config)) {
     env::remove_var("RUSTUP_TOOLCHAIN");
     env::remove_var("SHELL");
     env::remove_var("ZDOTDIR");
-    // clap does it's own terminal colour probing, and that isn't
+    // clap does its own terminal colour probing, and that isn't
     // trait-controllable, but it does honour the terminal. To avoid testing
     // claps code, lie about whatever terminal this process was started under.
     env::set_var("TERM", "dumb");
@@ -533,7 +533,7 @@ pub fn env<E: rustup_test::Env>(config: &Config, cmd: &mut E) {
     );
 
     // The unix fallback settings file may be present in the test environment, so override
-    // the path to the settings file with a non-existing path to avoid intereference
+    // the path to the settings file with a non-existing path to avoid interference
     cmd.env(
         "RUSTUP_OVERRIDE_UNIX_FALLBACK_SETTINGS",
         "/bogus-config-file.toml",
@@ -693,7 +693,7 @@ where
                     && e.kind() == std::io::ErrorKind::Other
                     && e.raw_os_error() == Some(26)
                 {
-                    // This is a ETXTBSY situation
+                    // This is an ETXTBSY situation
                     std::thread::sleep(std::time::Duration::from_millis(250));
                 } else {
                     panic!("Unable to run test command: {:?}", e);