Use a .toml file to store settings

Cargo.toml

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

src/rustup-cli/common.rs

@@ -9,7 +9,6 @@ use self_update;
 use std::io::{Write, Read, BufRead};
 use std::process::Command;
 use std::{cmp, iter};
-use std::str::FromStr;
 use std;
 use term2;
 
@@ -321,19 +320,15 @@ pub fn list_toolchains(cfg: &Cfg) -> Result<()> {
 }
 
 pub fn list_overrides(cfg: &Cfg) -> Result<()> {
-    let mut overrides = try!(cfg.override_db.list());
-
-    overrides.sort();
+    let overrides = try!(cfg.settings_file.with(|s| Ok(s.overrides.clone())));
 
     if overrides.is_empty() {
         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),
-                         li.1)
-            );
+        for (k, v) in overrides {
+            println!("{:<40}\t{:<20}",
+                     utils::format_path_for_display(&k),
+                     v)
         }
     }
     Ok(())
@@ -344,15 +339,6 @@ pub fn version() -> &'static str {
     concat!(env!("CARGO_PKG_VERSION"), include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt")))
 }
 
-fn split_override<T: FromStr>(s: &str, separator: char) -> Option<(T, T)> {
-    s.find(separator).and_then(|index| {
-        match (T::from_str(&s[..index]), T::from_str(&s[index + 1..])) {
-            (Ok(l), Ok(r)) => Some((l, r)),
-            _ => None
-        }
-    })
-}
-
 
 pub fn report_error(e: &Error) {
     err!("{}", e);

src/rustup-cli/multirust_mode.rs

@@ -265,15 +265,13 @@ fn remove_override(cfg: &Cfg, m: &ArgMatches) -> Result<()> {
     let ref path = m.value_of("override")
         .map(|p| PathBuf::from(p)).unwrap_or(cwd);
 
-    if try!(cfg.override_db.find(path, cfg.notify_handler.as_ref())).is_none() {
+    if try!(cfg.settings_file.with_mut(|s| {
+        Ok(s.remove_override(path, cfg.notify_handler.as_ref()))
+    })) {
+        info!("override toolchain for '{}' removed", path.display());
+    } else {
         info!("no override toolchain for '{}'", path.display());
-        return Ok(());
     }
-
-    try!(cfg.override_db.remove(path,
-                                &cfg.temp_cfg,
-                                cfg.notify_handler.as_ref()));
-    info!("override toolchain for '{}' removed", path.display());
     Ok(())
 }
 

src/rustup-cli/rustup_mode.rs

@@ -440,16 +440,13 @@ fn override_add(cfg: &Cfg, m: &ArgMatches) -> Result<()> {
 fn override_remove(cfg: &Cfg) -> Result<()> {
     let ref path = try!(utils::current_dir());
 
-    let ref override_db = cfg.override_db;
-    let notify_handler = cfg.notify_handler.as_ref();
-
-    if try!(override_db.find(path, notify_handler)).is_none() {
+    if try!(cfg.settings_file.with_mut(|s| {
+        Ok(s.remove_override(path, cfg.notify_handler.as_ref()))
+    })) {
+        info!("override toolchain for '{}' removed", path.display());
+    } else {
         info!("no override toolchain for '{}'", path.display());
-        return Ok(());
     }
-
-    try!(override_db.remove(path, &cfg.temp_cfg, notify_handler));
-    info!("override toolchain for '{}' removed", path.display());
     Ok(())
 }
 

src/rustup-dist/src/config.rs

@@ -1,6 +1,6 @@
 use toml;
 
-use toml_utils::*;
+use rustup_utils::toml_utils::*;
 use errors::*;
 use super::manifest::Component;
 

src/rustup-dist/src/errors.rs

@@ -93,10 +93,6 @@ error_chain! {
         Parsing(e: Vec<toml::ParserError>) {
             description("error parsing manifest")
         }
-        ExpectedType(t: &'static str, n: String) {
-            description("expected type")
-            display("expected type: '{}' for '{}'", t, n)
-        }
         UnsupportedVersion(v: String) {
             description("unsupported manifest version")
             display("manifest version '{}' is not supported", v)
@@ -116,7 +112,7 @@ fn component_unavailable_msg(cs: &[Component]) -> String {
     assert!(!cs.is_empty());
 
     let mut buf = vec![];
-    
+
     if cs.len() == 1 {
         let _ = write!(buf, "component '{}' for '{}' is unavailable for download",
                        cs[0].pkg, cs[0].target);

src/rustup-dist/src/lib.rs

@@ -27,4 +27,3 @@ pub mod manifestation;
 pub mod download;
 pub mod manifest;
 pub mod config;
-mod toml_utils;

src/rustup-dist/src/manifest.rs

@@ -12,7 +12,7 @@
 
 use errors::*;
 use toml;
-use toml_utils::*;
+use rustup_utils::toml_utils::*;
 
 use std::collections::HashMap;
 use dist::TargetTriple;

src/rustup-utils/Cargo.toml

@@ -19,6 +19,7 @@ libc = "0.2.0"
 native-tls = { git = "https://github.com/sfackler/rust-native-tls.git" }
 rustc-serialize = "0.3.19"
 sha2 = "0.1.2"
+toml = "0.1.27"
 
 [target.'cfg(not(any(target_os = "windows", target_os = "macos")))'.dependencies]
 openssl-sys = "0.7.11"

src/rustup-utils/src/errors.rs

@@ -43,6 +43,10 @@ error_chain! {
             description("could not create directory")
             display("could not crate {} directory: '{}'", name, path.display())
         }
+        ExpectedType(t: &'static str, n: String) {
+            description("expected type")
+            display("expected type: '{}' for '{}'", t, n)
+        }
         FilteringFile {
             name: &'static str,
             src: PathBuf,

src/rustup-utils/src/lib.rs

@@ -10,6 +10,7 @@ extern crate error_chain;
 extern crate native_tls;
 extern crate rustc_serialize;
 extern crate sha2;
+extern crate toml;
 #[cfg(not(any(target_os = "windows", target_os = "macos")))]
 extern crate openssl_sys;
 
@@ -37,6 +38,7 @@ pub mod notifications;
 pub mod raw;
 pub mod tty;
 pub mod utils;
+pub mod toml_utils;
 
 pub use errors::*;
 pub use notifications::{Notification, NotifyHandler};

src/rustup-dist/src/toml_utils.rs → src/rustup-utils/src/toml_utils.rs

@@ -16,6 +16,18 @@ pub fn get_string(table: &mut toml::Table, key: &str, path: &str) -> Result<Stri
     })
 }
 
+pub fn get_opt_string(table: &mut toml::Table, key: &str, path: &str) -> Result<Option<String>> {
+    if let Ok(v) = get_value(table, key, path) {
+        if let toml::Value::String(s) = v {
+            Ok(Some(s))
+        } else {
+            Err(ErrorKind::ExpectedType("string", path.to_owned() + key).into())
+        }
+    } else {
+        Ok(None)
+    }
+}
+
 pub fn get_bool(table: &mut toml::Table, key: &str, path: &str) -> Result<bool> {
     get_value(table, key, path).and_then(|v| {
         if let toml::Value::Boolean(b) = v {