Skip to content

Commit c583806

Browse files
Clean up Windows comments
1 parent b14177a commit c583806

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

src/cli/job.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// FIXME: stolen from cargo. Should be extracted into a common crate.
22

3-
//! Job management (mostly for windows)
3+
//! Job management (mostly for Windows)
44
//!
55
//! Most of the time when you're running cargo you expect Ctrl-C to actually
66
//! terminate the entire tree of processes in play, not just the one at the top

src/cli/self_update/unix.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,7 @@ pub fn do_remove_from_programs() -> Result<()> {
129129
}
130130

131131
/// Tell the upgrader to replace the rustup bins, then delete
132-
/// itself. Like with uninstallation, on Windows we're going to
133-
/// have to jump through hoops to make everything work right.
134-
///
135-
/// On windows we're not going to wait for it to finish before exiting
136-
/// successfully, so it should not do much, and it should try
137-
/// really hard to succeed, because at this point the upgrade is
138-
/// considered successful.
132+
/// itself.
139133
pub fn run_update(setup_path: &Path) -> Result<utils::ExitCode> {
140134
let status = Command::new(setup_path)
141135
.arg("--self-replace")
@@ -151,8 +145,7 @@ pub fn run_update(setup_path: &Path) -> Result<utils::ExitCode> {
151145

152146
/// This function is as the final step of a self-upgrade. It replaces
153147
/// `CARGO_HOME`/bin/rustup with the running exe, and updates the the
154-
/// links to it. On windows this will run *after* the original
155-
/// rustup process exits.
148+
/// links to it.
156149
pub fn self_replace() -> Result<utils::ExitCode> {
157150
install_bins()?;
158151

@@ -181,7 +174,7 @@ fn remove_legacy_source_command(source_cmd: String) -> Result<()> {
181174

182175
fn remove_legacy_paths() -> Result<()> {
183176
// Before the work to support more kinds of shells, which was released in
184-
// version 1.23.0 of rustup, we always inserted this line instead, which is
177+
// version 1.23.0 of Rustup, we always inserted this line instead, which is
185178
// now considered legacy
186179
remove_legacy_source_command(format!(
187180
"export PATH=\"{}/bin:$PATH\"\n",

src/cli/self_update/windows.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ pub fn self_replace() -> Result<utils::ExitCode> {
391391
// This file is opened as inheritable so that subsequent
392392
// processes created with the option to inherit handles
393393
// will also keep them open.
394-
// - Run the gc exe, which waits for the original rustup
394+
// - Run the gc exe, which waits for the original rustup.exe
395395
// process to close, then deletes CARGO_HOME. This process
396396
// has inherited a FILE_FLAG_DELETE_ON_CLOSE handle to itself.
397397
// - Finally, spawn yet another system binary with the inherit handles

0 commit comments

Comments
 (0)