Remove complete_windows_uninstall from unix.rs

Author: workingjubilee

src/bin/rustup-init.rs

@@ -16,12 +16,14 @@
 
 use std::path::PathBuf;
 
+use cfg_if::cfg_if;
 use rs_tracing::*;
 
 use rustup::cli::common;
 use rustup::cli::errors::*;
 use rustup::cli::proxy_mode;
 use rustup::cli::rustup_mode;
+#[cfg(windows)]
 use rustup::cli::self_update;
 use rustup::cli::setup_mode;
 use rustup::currentprocess::{process, with, OSProcess};
@@ -83,7 +85,13 @@ fn run_rustup_inner() -> Result<utils::ExitCode> {
         Some(n) if n.starts_with("rustup-gc-") => {
             // This is the final uninstallation stage on windows where
             // rustup deletes its own exe
-            self_update::complete_windows_uninstall()
+            cfg_if! {
+                if #[cfg(windows)] {
+                    self_update::complete_windows_uninstall()
+                } else {
+                    unreachable!("Attempted to use Windows-specific code on a non-Windows platform. Aborting.")
+                }
+            }
         }
         Some(_) => proxy_mode::main(),
         None => {

src/cli/self_update.rs

@@ -66,7 +66,9 @@ use crate::utils::Notification;
 use crate::{Cfg, UpdateStatus};
 use crate::{DUP_TOOLS, TOOLS};
 use os::*;
-pub use os::{complete_windows_uninstall, delete_rustup_and_cargo_home, run_update, self_replace};
+pub use os::{delete_rustup_and_cargo_home, run_update, self_replace};
+#[cfg(windows)]
+pub use windows::complete_windows_uninstall;
 
 pub struct InstallOpts<'a> {
     pub default_host_triple: Option<String>,

src/cli/self_update/unix.rs

@@ -53,10 +53,6 @@ pub fn delete_rustup_and_cargo_home() -> Result<()> {
     Ok(())
 }
 
-pub fn complete_windows_uninstall() -> Result<utils::ExitCode> {
-    panic!("stop doing that")
-}
-
 pub fn do_remove_from_path() -> Result<()> {
     for sh in shell::get_available_shells() {
         let source_bytes = format!("{}\n", sh.source_string()?).into_bytes();