Switching over to get-string for registry credentials.

diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs
index 5b127c78d6b1ceee0fd30324f6da642522170620..d8364c28d29cfc8a2ff95d072a2508b0626f0bd3 100755 (executable)
--- a/src/cargo/ops/registry.rs
+++ b/src/cargo/ops/registry.rs
@@ -16,7 +16,7 @@ use core::dependency::Kind;
 use core::manifest::ManifestMetadata;
 use ops;
 use sources::{RegistrySource};
-use util::config::{self, Config, ConfigValue};
+use util::config::{self, Config};
 use util::paths;
 use util::ToUrl;
 use util::errors::{CargoError, CargoResult, CargoResultExt};
@@ -196,16 +196,8 @@ pub fn registry_configuration(config: &Config,
 
     let (index, token) = match registry {
         Some(registry) => {
-            let index = Some(config.get_registry_index(&registry)?.to_string());
-            let table = config.get_table(&format!("registry.{}", registry))?.map(|t| t.val);
-            let token = table.and_then(|table| {
-                match table.get("token".into()) {
-                    Some(&ConfigValue::String(ref i, _)) => Some(i.to_string()),
-                    _ => None,
-                }
-            });
-
-            (index, token)
+            (Some(config.get_registry_index(&registry)?.to_string()),
+             config.get_string(&format!("registry.{}.token", registry))?.map(|p| p.val))
         }
         None => {
             // Checking out for default index and token