From de55d0250b757b2ef46ecb6fb961544dbb4cd6a8 Mon Sep 17 00:00:00 2001 From: Evgen Druzhynin Date: Wed, 25 Oct 2017 15:42:40 -0700 Subject: [PATCH] Remove a token as parameter for publish, yank, owner. --- src/bin/owner.rs | 3 --- src/bin/publish.rs | 4 ---- src/bin/yank.rs | 3 --- src/cargo/ops/registry.rs | 15 ++++----------- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/bin/owner.rs b/src/bin/owner.rs index 6c76a6fafc5..431bed38f29 100644 --- a/src/bin/owner.rs +++ b/src/bin/owner.rs @@ -4,7 +4,6 @@ use cargo::util::{CliResult, Config}; #[derive(Deserialize)] pub struct Options { arg_crate: Option, - flag_token: Option, flag_add: Option>, flag_remove: Option>, flag_index: Option, @@ -30,7 +29,6 @@ Options: -r, --remove LOGIN Name of a user or team to remove as an owner -l, --list List owners of a crate --index INDEX Registry index to modify owners for - --token TOKEN API token to use when authenticating -v, --verbose ... Use verbose output (-vv very verbose/build.rs output) -q, --quiet No output printed to stdout --color WHEN Coloring: auto, always, never @@ -56,7 +54,6 @@ pub fn execute(options: Options, config: &mut Config) -> CliResult { &options.flag_z)?; let opts = ops::OwnersOptions { krate: options.arg_crate, - token: options.flag_token, index: options.flag_index, to_add: options.flag_add, to_remove: options.flag_remove, diff --git a/src/bin/publish.rs b/src/bin/publish.rs index c34a0e27067..5741d9765f4 100644 --- a/src/bin/publish.rs +++ b/src/bin/publish.rs @@ -7,7 +7,6 @@ use cargo::util::important_paths::find_root_manifest_for_wd; pub struct Options { flag_index: Option, flag_host: Option, // TODO: Deprecated, remove - flag_token: Option, flag_target: Option, flag_manifest_path: Option, flag_verbose: u32, @@ -33,7 +32,6 @@ Options: -h, --help Print this message --index INDEX Registry index to upload the package to --host HOST DEPRECATED, renamed to '--index' - --token TOKEN Token to use when uploading --no-verify Don't verify package tarball before publish --allow-dirty Allow publishing with a dirty source directory --target TRIPLE Build for the target triple @@ -58,7 +56,6 @@ pub fn execute(options: Options, config: &mut Config) -> CliResult { &options.flag_z)?; let Options { - flag_token: token, flag_index: index, flag_host: host, // TODO: Deprecated, remove flag_manifest_path, @@ -91,7 +88,6 @@ about this warning."; let ws = Workspace::new(&root, config)?; ops::publish(&ws, &ops::PublishOpts { config: config, - token: token, index: if host.clone().is_none() || host.clone().unwrap().is_empty() { index } else { config.shell().warn(&msg)?; host }, // TODO: Deprecated, remove diff --git a/src/bin/yank.rs b/src/bin/yank.rs index a00892a5193..0b19323a20f 100644 --- a/src/bin/yank.rs +++ b/src/bin/yank.rs @@ -4,7 +4,6 @@ use cargo::util::{CliResult, Config}; #[derive(Deserialize)] pub struct Options { arg_crate: Option, - flag_token: Option, flag_vers: Option, flag_index: Option, flag_verbose: u32, @@ -28,7 +27,6 @@ Options: --vers VERSION The version to yank or un-yank --undo Undo a yank, putting a version back into the index --index INDEX Registry index to yank from - --token TOKEN API token to use when authenticating -v, --verbose ... Use verbose output (-vv very verbose/build.rs output) -q, --quiet No output printed to stdout --color WHEN Coloring: auto, always, never @@ -55,7 +53,6 @@ pub fn execute(options: Options, config: &mut Config) -> CliResult { ops::yank(config, options.arg_crate, options.flag_vers, - options.flag_token, options.flag_index, options.flag_undo)?; Ok(()) diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs index d1bd31caf69..a12e9fa2c5d 100644 --- a/src/cargo/ops/registry.rs +++ b/src/cargo/ops/registry.rs @@ -29,7 +29,6 @@ pub struct RegistryConfig { pub struct PublishOpts<'cfg> { pub config: &'cfg Config, - pub token: Option, pub index: Option, pub verify: bool, pub allow_dirty: bool, @@ -50,7 +49,6 @@ pub fn publish(ws: &Workspace, opts: &PublishOpts) -> CargoResult<()> { } let (mut registry, reg_id) = registry(opts.config, - opts.token.clone(), opts.index.clone())?; verify_dependencies(pkg, ®_id)?; @@ -196,14 +194,12 @@ pub fn registry_configuration(config: &Config) -> CargoResult { } pub fn registry(config: &Config, - token: Option, index: Option) -> CargoResult<(Registry, SourceId)> { // Parse all configuration options let RegistryConfig { - token: token_config, + token, index: _index_config, } = registry_configuration(config)?; - let token = token.or(token_config); let sid = match index { Some(index) => SourceId::for_registry(&index.to_url()?)?, None => SourceId::crates_io(config)?, @@ -306,7 +302,6 @@ pub fn registry_login(config: &Config, token: String) -> CargoResult<()> { pub struct OwnersOptions { pub krate: Option, - pub token: Option, pub index: Option, pub to_add: Option>, pub to_remove: Option>, @@ -323,8 +318,7 @@ pub fn modify_owners(config: &Config, opts: &OwnersOptions) -> CargoResult<()> { } }; - let (mut registry, _) = registry(config, opts.token.clone(), - opts.index.clone())?; + let (mut registry, _) = registry(config, opts.index.clone())?; if let Some(ref v) = opts.to_add { let v = v.iter().map(|s| &s[..]).collect::>(); @@ -365,7 +359,6 @@ pub fn modify_owners(config: &Config, opts: &OwnersOptions) -> CargoResult<()> { pub fn yank(config: &Config, krate: Option, version: Option, - token: Option, index: Option, undo: bool) -> CargoResult<()> { let name = match krate { @@ -381,7 +374,7 @@ pub fn yank(config: &Config, None => bail!("a version must be specified to yank") }; - let (mut registry, _) = registry(config, token, index)?; + let (mut registry, _) = registry(config, index)?; if undo { config.shell().status("Unyank", format!("{}:{}", name, version))?; @@ -410,7 +403,7 @@ pub fn search(query: &str, } } - let (mut registry, _) = registry(config, None, index)?; + let (mut registry, _) = registry(config, index)?; let (crates, total_crates) = registry.search(query, limit).map_err(|e| { CargoError::from(format!("failed to retrieve search results from the registry: {}", e)) })?;