Merge pull request #418 from rust-lang-nursery/term-md

Improvements to welcome screen

Cargo.toml

@@ -33,6 +33,7 @@ rand = "0.3.11"
 scopeguard = "0.1.2"
 rustc-serialize = "0.3"
 sha2 = "0.1.2"
+markdown = { git="https://github.com/Diggsey/markdown.rs.git" }
 
 [target."cfg(windows)".dependencies]
 winapi = "0.2.4"

src/rustup-cli/common.rs

@@ -34,15 +34,18 @@ pub enum Confirm {
     Yes, No, Advanced
 }
 
-pub fn confirm_advanced(default: Confirm) -> Result<Confirm> {
+pub fn confirm_advanced() -> Result<Confirm> {
+    println!("");
+    println!("1) Proceed with installation (default)");
+    println!("2) Customize installation");
+    println!("3) Cancel installation");
+
     let _ = std::io::stdout().flush();
     let input = try!(read_line());
 
     let r = match &*input {
-        "y" | "Y" | "yes" => Confirm::Yes,
-        "n" | "N" | "no" => Confirm::No,
-        "a" | "A" | "advanced" => Confirm::Advanced,
-        "" => default,
+        "1"|"" => Confirm::Yes,
+        "2" => Confirm::Advanced,
         _ => Confirm::No,
     };
 
@@ -99,7 +102,7 @@ pub fn set_globals(verbose: bool) -> Result<Cfg> {
 
     let download_tracker = RefCell::new(DownloadTracker::new());
 
-    Ok(try!(Cfg::from_env(shared_ntfy!(move |n: Notification| { 
+    Ok(try!(Cfg::from_env(shared_ntfy!(move |n: Notification| {
        if download_tracker.borrow_mut().handle_notification(&n) {
             return;
         }
@@ -300,10 +303,10 @@ pub fn list_toolchains(cfg: &Cfg) -> Result<()> {
     } else {
         if let Ok(Some(def_toolchain)) = cfg.find_default() {
             for toolchain in toolchains {
-                let if_default = if def_toolchain.name() == &*toolchain { 
-                    " (default)" 
-                } else { 
-                    "" 
+                let if_default = if def_toolchain.name() == &*toolchain {
+                    " (default)"
+                } else {
+                    ""
                 };
                 println!("{}{}", &toolchain, if_default);
             }
@@ -326,9 +329,9 @@ pub fn list_overrides(cfg: &Cfg) -> Result<()> {
         println!("no overrides");
     } else {
         for o in overrides {
-            split_override::<String>(&o, ';').map(|li| 
-                println!("{:<40}\t{:<20}", 
-                         utils::format_path_for_display(&li.0), 
+            split_override::<String>(&o, ';').map(|li|
+                println!("{:<40}\t{:<20}",
+                         utils::format_path_for_display(&li.0),
                          li.1)
             );
         }

src/rustup-cli/main.rs

@@ -18,6 +18,7 @@ extern crate rand;
 extern crate scopeguard;
 extern crate tempdir;
 extern crate sha2;
+extern crate markdown;
 
 #[cfg(windows)]
 extern crate winapi;
@@ -169,4 +170,3 @@ fn fix_windows_reg_key() {
 
 #[cfg(not(windows))]
 fn fix_windows_reg_key() { }
-