From: Chris Swindle <christopher.swindle@metaswitch.com>
Date: Tue, 31 Oct 2017 05:20:41 +0000 (+0000)
Subject: Switching over to get-string for registry credentials.
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~5^2~13^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=31cb68df376af7ad2ede1b8dca3b83489c0165b3;p=cargo.git

Switching over to get-string for registry credentials.
---

diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs
index 5b127c78d..d8364c28d 100755
--- 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