Skip to content

Commit b14177a

Browse files
Editing: Use Rustup where apropos
1 parent b132a85 commit b14177a

File tree

6 files changed

+19
-20
lines changed

6 files changed

+19
-20
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# rustup: the Rust toolchain installer
1+
# Rustup: the Rust toolchain installer
22

33
| Master CI | Build Status |
44
|--------------|----------------------------------------------------------|
55
| Windows | ![Windows builds][actions-windows-master] |
66
| macOS | ![maOS builds][actions-macos-master] |
77
| Linux Etc | ![Linux (etc) builds][actions-linux-master] |
88

9-
*rustup* installs [The Rust Programming Language][rustlang] from the official
9+
*Rustup* installs [The Rust Programming Language][rustlang] from the official
1010
release channels, enabling you to easily switch between stable, beta,
1111
and nightly compilers and keep them updated. It makes cross-compiling
1212
simpler with binary builds of the standard library for common platforms.
@@ -16,16 +16,16 @@ And it runs on all platforms Rust supports, including Windows.
1616

1717
## Documentation
1818

19-
See [**The rustup book**](https://rust-lang.github.io/rustup/) for
20-
documentation on installing and using rustup.
19+
See [**The Rustup book**](https://rust-lang.github.io/rustup/) for
20+
documentation on installing and using Rustup.
2121

2222
## Contributing
2323

24-
See [CONTRIBUTING.md](CONTRIBUTING.md) for information on contributing to rustup.
24+
See [CONTRIBUTING.md](CONTRIBUTING.md) for information on contributing to Rustup.
2525

2626
## License
2727

28-
Copyright Diggory Blake, the Mozilla Corporation, and rustup
28+
Copyright Diggory Blake, the Mozilla Corporation, and Rustup
2929
contributors.
3030

3131
Licensed under either of

src/bin/rustup-init.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
//! The main rustup commandline application
1+
//! The main Rustup command-line interface
22
//!
33
//! The rustup binary is a chimera, changing its behavior based on the
44
//! name of the binary. This is used most prominently to enable
5-
//! rustup's tool 'proxies' - that is, rustup itself and the rustup
6-
//! proxies are the same binary; when the binary is called 'rustup' or
7-
//! 'rustup.exe' rustup behaves like the rustup commandline
8-
//! application; when it is called 'rustc' it behaves as a proxy to
9-
//! 'rustc'.
5+
//! Rustup's tool 'proxies' - that is, rustup itself and the rustup
6+
//! proxies are the same binary: when the binary is called 'rustup' or
7+
//! 'rustup.exe' it offers the Rustup command-line interface, and
8+
//! when it is called 'rustc' it behaves as a proxy to 'rustc'.
109
//!
11-
//! This scheme is further used to distinguish the rustup installer,
12-
//! called 'rustup-init' which is again just the rustup binary under a
10+
//! This scheme is further used to distinguish the Rustup installer,
11+
//! called 'rustup-init', which is again just the rustup binary under a
1312
//! different name.
1413
1514
#![recursion_limit = "1024"]

src/cli/help.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pub static RUSTUP_HELP: &str = r"DISCUSSION:
2-
rustup installs The Rust Programming Language from the official
2+
Rustup installs The Rust Programming Language from the official
33
release channels, enabling you to easily switch between stable,
44
beta, and nightly compilers and keep them updated. It makes
55
cross-compiling simpler with binary builds of the standard library
@@ -105,7 +105,7 @@ pub static TOOLCHAIN_LINK_HELP: &str = r"DISCUSSION:
105105
toolchain 'latest-stage1' will be used.";
106106

107107
pub static OVERRIDE_HELP: &str = r"DISCUSSION:
108-
Overrides configure rustup to use a specific toolchain when
108+
Overrides configure Rustup to use a specific toolchain when
109109
running in a specific directory.
110110
111111
Directories can be assigned their own Rust toolchain with `rustup

src/cli/self_update/shell.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
//!
2222
//! Rustup addresses this by:
2323
//! 1) using a shell script that updates PATH if the path is not in PATH
24-
//! 2) sourcing this script in any known and appropriate rc file
24+
//! 2) sourcing this script (`. /path/to/script`) in any appropriate rc file
2525
2626
use std::path::PathBuf;
2727

@@ -82,7 +82,7 @@ pub trait UnixShell {
8282
// heuristic should be used, assuming shells exist if any traces do.
8383
fn does_exist(&self) -> bool;
8484

85-
// Gives all rcfiles of a given shell that rustup is concerned with.
85+
// Gives all rcfiles of a given shell that Rustup is concerned with.
8686
// Used primarily in checking rcfiles for cleanup.
8787
fn rcfiles(&self) -> Vec<PathBuf>;
8888

src/cli/self_update/windows.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ pub fn self_replace() -> Result<utils::ExitCode> {
383383
// like when they are running.
384384
//
385385
// Here's what we're going to do:
386-
// - Copy rustup to a temporary file in
386+
// - Copy rustup.exe to a temporary file in
387387
// CARGO_HOME/../rustup-gc-$random.exe.
388388
// - Open the gc exe with the FILE_FLAG_DELETE_ON_CLOSE and
389389
// FILE_SHARE_DELETE flags. This is going to be the last

src/utils/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
///! Utility functions for rustup
1+
///! Utility functions for Rustup
22
pub mod notifications;
33
pub mod raw;
44
pub mod toml_utils;

0 commit comments

Comments
 (0)