itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-25 11:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(gctx): rename variable to reflect it is a toml doc

Browse Source
This commit is contained in:
Weihang Lo 2025-09-18 11:01:45 -04:00
parent 49c92411a6
commit 397bdb72cc
No known key found for this signature in database
GPG Key ID: D7DBF189825E82E7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cargo/util/context/mod.rs
View File

@ -1464,19 +1464,19 @@ impl GlobalContext {
.with_context(|| format!("failed to load config from `{}`", str_path))? .with_context(|| format!("failed to load config from `{}`", str_path))?
} else { } else {
let doc = toml_dotted_keys(arg)?; let doc = toml_dotted_keys(arg)?;
let toml_v: toml::Value = toml::Value::deserialize(doc.into_deserializer()) let doc: toml::Value = toml::Value::deserialize(doc.into_deserializer())
.with_context(|| { .with_context(|| {
format!("failed to parse value from --config argument `{arg}`") format!("failed to parse value from --config argument `{arg}`")
})?; })?;
if toml_v if doc
.get("registry") .get("registry")
.and_then(|v| v.as_table()) .and_then(|v| v.as_table())
.and_then(|t| t.get("token")) .and_then(|t| t.get("token"))
.is_some() .is_some()
{ {
bail!("registry.token cannot be set through --config for security reasons"); bail!("registry.token cannot be set through --config for security reasons");
} else if let Some((k, _)) = toml_v } else if let Some((k, _)) = doc
.get("registries") .get("registries")
.and_then(|v| v.as_table()) .and_then(|v| v.as_table())
.and_then(|t| t.iter().find(|(_, v)| v.get("token").is_some())) .and_then(|t| t.iter().find(|(_, v)| v.get("token").is_some()))
@ -1487,7 +1487,7 @@ impl GlobalContext {
); );
} }
if toml_v if doc
.get("registry") .get("registry")
.and_then(|v| v.as_table()) .and_then(|v| v.as_table())
.and_then(|t| t.get("secret-key")) .and_then(|t| t.get("secret-key"))
@ -1496,7 +1496,7 @@ impl GlobalContext {
bail!( bail!(
"registry.secret-key cannot be set through --config for security reasons" "registry.secret-key cannot be set through --config for security reasons"
); );
} else if let Some((k, _)) = toml_v } else if let Some((k, _)) = doc
.get("registries") .get("registries")
.and_then(|v| v.as_table()) .and_then(|v| v.as_table())
.and_then(|t| t.iter().find(|(_, v)| v.get("secret-key").is_some())) .and_then(|t| t.iter().find(|(_, v)| v.get("secret-key").is_some()))
@ -1507,7 +1507,7 @@ impl GlobalContext {
); );
} }
CV::from_toml(Definition::Cli(None), toml_v) CV::from_toml(Definition::Cli(None), doc)
.with_context(|| format!("failed to convert --config argument `{arg}`"))? .with_context(|| format!("failed to convert --config argument `{arg}`"))?
}; };
let tmp_table = self let tmp_table = self