From 31cb68df376af7ad2ede1b8dca3b83489c0165b3 Mon Sep 17 00:00:00 2001 From: Chris Swindle Date: Tue, 31 Oct 2017 05:20:41 +0000 Subject: [PATCH] Switching over to get-string for registry credentials. --- src/cargo/ops/registry.rs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) 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(®istry)?.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(®istry)?.to_string()), + config.get_string(&format!("registry.{}.token", registry))?.map(|p| p.val)) } None => { // Checking out for default index and token -- 2.30.2