From ff1e1582dd75756cb8266422b7266c09beaf359d Mon Sep 17 00:00:00 2001 From: Chris Moore <35407569+csm123199@users.noreply.github.com> Date: Thu, 3 Dec 2020 13:09:55 -0600 Subject: [PATCH 1/5] stop cargo_home from unnecessarily getting $HOME also prevent unnecessary UTF8 compliance assertion for $CARGO_HOME --- src/registry.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/registry.rs b/src/registry.rs index cc5863c318..3d4e68ead9 100644 --- a/src/registry.rs +++ b/src/registry.rs @@ -38,14 +38,16 @@ struct CargoConfig { source: HashMap, } +/// Returns the user's configured, or default, cargo home directory. fn cargo_home() -> Result { - let default_cargo_home = dirs::home_dir() - .map(|x| x.join(".cargo")) - .chain_err(|| ErrorKind::ReadHomeDirFailure)?; - let cargo_home = std::env::var("CARGO_HOME") - .map(PathBuf::from) - .unwrap_or(default_cargo_home); - Ok(cargo_home) + // use $HOME/.cargo if no $CARGO_HOME or $CARGO_HOME has bad UTF8 + match std::env::var_os("CARGO_HOME") { + Some(cargo_home) => Ok(cargo_home.into()), + None => { + let userhome = dirs::home_dir().chain_err(|| ErrorKind::ReadHomeDirFailure)?; + Ok(userhome.join(".cargo")) + } + } } /// Find the URL of a registry From 03f6d74b1407b329948df0a23aae22c35f523b97 Mon Sep 17 00:00:00 2001 From: Chris Moore <35407569+csm123199@users.noreply.github.com> Date: Sat, 12 Dec 2020 23:47:51 -0600 Subject: [PATCH 2/5] use new 'RegistryReq' for public functions (registry.rs) broke `registry_url` down into smaller functions (registry.rs) implemented RegistryReq struct, meant to abstract the idea of 'getting a registry' - allows obtaining a registry without attaching a project directory, or traversing the file system (direct URL) (fetch.rs) seperate concerns with get_latest_dependency - caller shouldn't have to get the registry URL - just know the context of the request (upgrade/main.rs) add comments to & reorganize DesiredUpgrades::get_upgraded --- src/bin/add/args.rs | 15 +-- src/bin/add/main.rs | 7 +- src/bin/upgrade/main.rs | 85 +++++++------ src/errors.rs | 5 + src/fetch.rs | 12 +- src/lib.rs | 2 +- src/registry.rs | 265 +++++++++++++++++++++++++++++++++------- 7 files changed, 289 insertions(+), 102 deletions(-) diff --git a/src/bin/add/args.rs b/src/bin/add/args.rs index ef5ee9cd8e..380f77b124 100644 --- a/src/bin/add/args.rs +++ b/src/bin/add/args.rs @@ -1,7 +1,7 @@ //! Handle `cargo add` arguments -use cargo_edit::{find, registry_url, Dependency}; -use cargo_edit::{get_latest_dependency, CrateName}; +use cargo_edit::{find, Dependency}; +use cargo_edit::{get_latest_dependency, CrateName, RegistryReq}; use std::path::PathBuf; use structopt::StructOpt; @@ -201,18 +201,15 @@ impl Args { if let Some(version) = &self.vers { dependency = dependency.set_version(parse_version_req(version)?); } - let registry_url = if let Some(registry) = &self.registry { - Some(registry_url(&find(&self.manifest_path)?, Some(registry))?) - } else { - None - }; if self.git.is_none() && self.path.is_none() && self.vers.is_none() { let dep = get_latest_dependency( crate_name.name(), self.allow_prerelease, - &find(&self.manifest_path)?, - ®istry_url, + RegistryReq::project( + self.registry.as_ref().map(String::as_ref), + &find(&self.manifest_path)?, + ), )?; let v = format!( "{prefix}{version}", diff --git a/src/bin/add/main.rs b/src/bin/add/main.rs index 64d3b92e08..6288660bad 100644 --- a/src/bin/add/main.rs +++ b/src/bin/add/main.rs @@ -17,6 +17,7 @@ extern crate error_chain; use crate::args::{Args, Command}; use cargo_edit::{ find, manifest_from_pkgid, registry_url, update_registry_index, Dependency, Manifest, + RegistryReq, }; use std::borrow::Cow; use std::io::Write; @@ -124,10 +125,10 @@ fn handle_add(args: &Args) -> Result<()> { let deps = &args.parse_dependencies()?; if !args.offline && std::env::var("CARGO_IS_TEST").is_err() { - let url = registry_url( - &find(&manifest_path)?, + let url = registry_url(&RegistryReq::project( args.registry.as_ref().map(String::as_ref), - )?; + &find(&manifest_path)?, + ))?; update_registry_index(&url)?; } diff --git a/src/bin/upgrade/main.rs b/src/bin/upgrade/main.rs index 1fae810f7b..24ffaa6507 100644 --- a/src/bin/upgrade/main.rs +++ b/src/bin/upgrade/main.rs @@ -17,7 +17,7 @@ extern crate error_chain; use crate::errors::*; use cargo_edit::{ find, get_latest_dependency, manifest_from_pkgid, registry_url, update_registry_index, - CrateName, Dependency, LocalManifest, + CrateName, Dependency, LocalManifest, RegistryReq, }; use failure::Fail; use std::collections::{HashMap, HashSet}; @@ -393,44 +393,58 @@ impl DesiredUpgrades { fn get_upgraded(self, allow_prerelease: bool, manifest_path: &Path) -> Result { self.0 .into_iter() - .map( - |( - dep, - UpgradeMetadata { - registry, - version, - is_prerelease, - }, - )| { - if let Some(v) = version { - Ok((dep, v)) - } else { - let registry_url = match registry { - Some(x) => Some(Url::parse(&x).map_err(|_| { + .map(|(dep, meta)| { + match meta.version { + // use previous version + Some(v) => Ok((dep, v)), + + // no version exists - get latest + None => { + // if a registry exists on a dependency, parse it as a URL + let registry_url = meta + .registry + .as_ref() + .map(|s| Url::parse(&s)) + .transpose() + .map_err(|_| { ErrorKind::CargoEditLib(::cargo_edit::ErrorKind::InvalidCargoConfig) - })?), - None => None, + })?; + + let use_prerelease = allow_prerelease || meta.is_prerelease; + + let latest_dep = if let Some(url) = registry_url { + // Configured registry URL + get_latest_dependency( + &dep.name, + use_prerelease, + RegistryReq::custom(url), + ) + } else { + // no configured registry - use crates.io + get_latest_dependency( + &dep.name, + use_prerelease, + // specifying registries by name must be qualified with a cargo.toml + // specifying purely by URL may work, but will need to call this function differently for knowing URL vs knowing name + RegistryReq::project( + (&meta.registry).as_ref().map(AsRef::as_ref), + manifest_path.parent().unwrap(), + ), + ) }; - let allow_prerelease = allow_prerelease || is_prerelease; - get_latest_dependency( - &dep.name, - allow_prerelease, - manifest_path, - ®istry_url, - ) - .map(|new_dep| { - ( - dep, - new_dep + + latest_dep + .map(|latest_dep| { + latest_dep .version() .expect("Invalid dependency type") - .to_string(), - ) - }) - .chain_err(|| "Failed to get new version") + .into() + }) + .map(|new_version| (dep, new_version)) + .chain_err(|| "Failed to get new version") } - }, - ) + } + }) .collect::>() .map(ActualUpgrades) } @@ -459,7 +473,8 @@ fn process(args: Args) -> Result<()> { let all = workspace || all; if !args.offline && !to_lockfile && std::env::var("CARGO_IS_TEST").is_err() { - let url = registry_url(&find(&manifest_path)?, None)?; + // get the project's crates.io registry URL + let url = registry_url(&RegistryReq::project(None, &find(&manifest_path)?))?; update_registry_index(&url)?; } diff --git a/src/errors.rs b/src/errors.rs index 6d30599413..67d9b89064 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -12,6 +12,11 @@ error_chain! { ReadHomeDirFailure { description("Failed to read home directory") } + /// Failed to absolutely resolve a relative directory + DirectoryResolutionFailure(dir: PathBuf) { + description("Failed to canonicalize a directory") + display("The path `{}` has failed to resolve to an absolute path", dir.display()) + } /// Invalid JSON in registry index InvalidSummaryJson { description("Invalid JSON in registry index") diff --git a/src/fetch.rs b/src/fetch.rs index fbf0d75de8..4687cdaad8 100644 --- a/src/fetch.rs +++ b/src/fetch.rs @@ -1,5 +1,5 @@ use crate::errors::*; -use crate::registry::{registry_path, registry_path_from_url}; +use crate::registry::{registry_path, registry_path_from_url, RegistryReq}; use crate::{Dependency, Manifest}; use regex::Regex; use std::env; @@ -30,8 +30,7 @@ struct CrateVersion { pub fn get_latest_dependency( crate_name: &str, flag_allow_prerelease: bool, - manifest_path: &Path, - registry: &Option, + registry: RegistryReq, ) -> Result { if env::var("CARGO_IS_TEST").is_ok() { // We are in a simulated reality. Nothing is real here. @@ -53,12 +52,9 @@ pub fn get_latest_dependency( return Err(ErrorKind::EmptyCrateName.into()); } - let registry_path = match registry { - Some(url) => registry_path_from_url(url)?, - None => registry_path(manifest_path, None)?, - }; + let registry_cache = registry_path(®istry)?; - let crate_versions = fuzzy_query_registry_index(crate_name, ®istry_path)?; + let crate_versions = fuzzy_query_registry_index(crate_name, ®istry_cache)?; let dep = read_latest_version(&crate_versions, flag_allow_prerelease)?; diff --git a/src/lib.rs b/src/lib.rs index 8ea0864bd1..8a87c1441a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -35,4 +35,4 @@ pub use crate::fetch::{ }; pub use crate::manifest::{find, LocalManifest, Manifest}; pub use crate::metadata::manifest_from_pkgid; -pub use crate::registry::registry_url; +pub use crate::registry::{registry_url, RegistryReq}; diff --git a/src/registry.rs b/src/registry.rs index 3d4e68ead9..03b7ce13c1 100644 --- a/src/registry.rs +++ b/src/registry.rs @@ -7,8 +7,10 @@ use url::Url; const CRATES_IO_INDEX: &str = "https://github.com/rust-lang/crates.io-index"; const CRATES_IO_REGISTRY: &str = "crates-io"; -pub fn registry_path(manifest_path: &Path, registry: Option<&str>) -> Result { - registry_path_from_url(®istry_url(manifest_path, registry)?) +/// Returns the filesystem path containing the cache for the specified registry (or `crates.io` if `None`). +/// The provided `manifest_path` is used to resolve custom registries provided in `registry_name` +pub fn registry_path(request: &RegistryReq) -> Result { + registry_path_from_url(®istry_url(request)?) } pub fn registry_path_from_url(registry: &Url) -> Result { @@ -38,6 +40,86 @@ struct CargoConfig { source: HashMap, } +/// A resolved index to a cargo registry +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct RegistryIndex(Url); +impl RegistryIndex { + /// Returns the internal short-name of the registry + pub fn short_name(&self) -> String { + short_name(&self.0) + } +} + +/// Allows definition of different cargo registries, and their source. +/// +// Note: registries can be defined in cargo project tomls, global user cargo configs, by URL, or by environment variables +// ref: https://doc.rust-lang.org/cargo/reference/registries.html +#[derive(Debug, Clone, PartialEq, Eq)] +pub enum RegistryReq<'a> { + /// Used to specify a registry defined within a project, or a project's parent directories (as defined within a .cargo/config). + Project { + /// A specific cargo registry, by name. Defaults to `crates.io` + registry_name: Option<&'a str>, + /// A path to start searching for cargo configs from + manifest_dir: &'a Path, + }, + /// Uses only the user's global cargo config, if it exists. `None` defaults to `crates.io` + User { + /// A specific cargo registry, by name. Defaults to `crates.io` + registry_name: Option<&'a str>, + }, + /// An unnamed specific cargo registry, by URL + Custom { + /// The URL to the registry's index + index: RegistryIndex, + }, +} +impl<'a> Default for RegistryReq<'a> { + /// Specifies the user's default crate repository - typically `crates.io` + fn default() -> RegistryReq<'a> { + // Use user as default to avoid possibly surprising scenario of project overriding registries + RegistryReq::User { + registry_name: None, + } + } +} +impl<'a> RegistryReq<'a> { + /// A registry specified by name, resolved using a user's project and global configuration. If no registry is provided, then `crates.io` is used. + pub fn project(registry_name: Option<&'a str>, manifest_dir: &'a Path) -> RegistryReq<'a> { + RegistryReq::Project { + registry_name, + manifest_dir, + } + } + + /// A registry specified by name, resolved using a user's global configuration. If none is provided, then `crates.io` is used. + pub fn user(registry_name: Option<&str>) -> RegistryReq<'_> { + RegistryReq::User { registry_name } + } + + /// A registry specified by URL. This URL is assumed to be valid. + pub fn custom(index: Url) -> RegistryReq<'a> { + RegistryReq::Custom { + index: RegistryIndex(index), + } + } + + /// Resolves the registry's index URL + pub fn index(&self) -> Result { + // check environment variable + // ref: https://doc.rust-lang.org/cargo/reference/registries.html#using-an-alternate-registry + // Can't find environment variable checking in cargo? + + // check cargo configs for `registries` entries + + // check default cargo + + // fallback to cargo? None? + + registry_url(self).map(RegistryIndex) + } +} + /// Returns the user's configured, or default, cargo home directory. fn cargo_home() -> Result { // use $HOME/.cargo if no $CARGO_HOME or $CARGO_HOME has bad UTF8 @@ -50,74 +132,165 @@ fn cargo_home() -> Result { } } -/// Find the URL of a registry -pub fn registry_url(manifest_path: &Path, registry: Option<&str>) -> Result { +/// Searches for a `(config|config.toml)` file inside the provided directory. +fn get_dir_config(dir: PathBuf) -> Option { + // prefer `config` over `config.toml` for compatibility (according to note in config reference below) + // ref: https://doc.rust-lang.org/cargo/reference/config.html + // note: should this method return an `impl io::Read` to prevent race conditions, if the config is removed? + + let mut target = dir.join("config"); + if target.is_file() { + return Some(target); + } + + target.set_extension("toml"); + if target.is_file() { + return Some(target); + } + + None +} + +/// Searches for `.cargo/(config|config.toml)` files at or above the base directory specified. +/// +/// The closest to the base directory (ie: the configs with the preferred values) are at the beginning of the returned list. +/// +/// Note this may also yield the user's global config file (the one returned from [`user_cargo_config`]) if the project directory within the user's home directory (Desktop, etc) +/// +/// See [Cargo Reference/Configuration/Hierarchical structure](https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure) for resolution details. +fn project_cargo_configs(base: &Path) -> Result> { + // TODO: (?) if found, return the opened file. + // This prevents a race condition involving the file disappearing before being able to read it. + + // return type: Result)>> ?? + // Outer result fails if there was an error traversing the file tree + // Option is None if none were found + // Inner result fails if there was an error opening the file (permissions, ...) + + // go up the filesystem looking for cargo configs + // ref: https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure + let cfgs = base + .canonicalize() + .chain_err(|| ErrorKind::DirectoryResolutionFailure(base.to_owned()))? + .ancestors() + .filter_map(|path| get_dir_config(path.join(".cargo"))) + .collect(); + + Ok(cfgs) +} + +/// Retrieves the user's global cargo config +fn user_cargo_config() -> Result> { + cargo_home().map(get_dir_config) +} + +/// Find the URL of a registry. Defaults to crates.io if no registry is provided. +/// +/// Uses a project's/user's cargo config files to resolve the registry to a URL. +pub fn registry_url(request: &RegistryReq) -> Result { // TODO support local registry sources, directory sources, git sources: https://doc.rust-lang.org/cargo/reference/source-replacement.html?highlight=replace-with#source-replacement - fn read_config(registries: &mut HashMap, path: impl AsRef) -> Result<()> { + + /// Takes the registries/sources from the specified cargo config toml file, and adds them to the HashMap + /// If there is a conflict, then the existing value is favored. + fn merge_cfg(registries: &mut HashMap, path: impl AsRef) -> Result<()> { // TODO unit test for source replacement - let content = std::fs::read(path)?; + let content = std::fs::read_to_string(path)?; let config = - toml::from_slice::(&content).map_err(|_| ErrorKind::InvalidCargoConfig)?; + toml::from_str::(&content).map_err(|_| ErrorKind::InvalidCargoConfig)?; + for (key, value) in config.registries { + // favor previous values registries.entry(key).or_insert(Source { registry: value.index, replace_with: None, }); } for (key, value) in config.source { + // favor previous values registries.entry(key).or_insert(value); } Ok(()) } + + // TODO implement support for registries specified via environment variables + // ref: https://doc.rust-lang.org/cargo/reference/registries.html#using-an-alternate-registry + + fn merge_user_config(registries: &mut HashMap) -> Result<()> { + // look at the user's global cargo config + if let Some(user_config) = user_cargo_config()? { + merge_cfg(registries, user_config)?; + } + + Ok(()) + } + + fn lookup_registry( + registries: &mut HashMap, + registry_name: Option<&str>, + ) -> Result { + //TODO: change impl to do simple lookups instead of removes? (then we don't have to mutate the lookup table -> lookups can be tested easier) + + // find head of the relevant linked list + let mut source = + match registry_name { + Some(CRATES_IO_INDEX) | None => registries + .remove(CRATES_IO_REGISTRY) + .unwrap_or_else(|| Source { + replace_with: None, + registry: Some(CRATES_IO_INDEX.to_string()), + }), + Some(r) => registries + .remove(r) + .chain_err(|| ErrorKind::NoSuchRegistryFound(r.to_string()))?, + }; + + // search this linked list and find the tail + while let Some(replace_with) = &source.replace_with { + source = registries + .remove(replace_with) + .chain_err(|| ErrorKind::NoSuchSourceFound(replace_with.to_string()))?; + } + + let registry_url = source + .registry + .and_then(|x| Url::parse(&x).ok()) + .chain_err(|| ErrorKind::InvalidCargoConfig)?; + + Ok(registry_url) + } + // registry might be replaced with another source // it's looks like a singly linked list // put relations in this map. let mut registries: HashMap = HashMap::new(); - // ref: https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure - for work_dir in manifest_path - .parent() - .expect("there must be a parent directory") - .ancestors() - { - let config_path = work_dir.join(".cargo").join("config"); - if config_path.is_file() { - read_config(&mut registries, config_path)?; - } - } - let default_config_path = cargo_home()?.join("config"); - if default_config_path.is_file() { - read_config(&mut registries, default_config_path)?; - } + let registry_index: Url = match request { + RegistryReq::Custom { index } => { + // We were already given a bare index URL - return that + index.0.clone() + } + RegistryReq::User { registry_name } => { + // Lookup a URL based on global user config + merge_user_config(&mut registries)?; - // find head of the relevant linked list - let mut source = match registry { - Some(CRATES_IO_INDEX) | None => { - registries - .remove(CRATES_IO_REGISTRY) - .unwrap_or_else(|| Source { - replace_with: None, - registry: Some(CRATES_IO_INDEX.to_string()), - }) + lookup_registry(&mut registries, *registry_name)? } - Some(r) => registries - .remove(r) - .chain_err(|| ErrorKind::NoSuchRegistryFound(r.to_string()))?, - }; + RegistryReq::Project { + registry_name, + manifest_dir, + } => { + // only use a project's registry configurations, if they exist + project_cargo_configs(manifest_dir)? + .iter() + .try_for_each(|config_path| merge_cfg(&mut registries, config_path))?; - // search this linked list and find the tail - while let Some(replace_with) = &source.replace_with { - source = registries - .remove(replace_with) - .chain_err(|| ErrorKind::NoSuchSourceFound(replace_with.to_string()))?; - } + merge_user_config(&mut registries)?; - let registry_url = source - .registry - .and_then(|x| Url::parse(&x).ok()) - .chain_err(|| ErrorKind::InvalidCargoConfig)?; + lookup_registry(&mut registries, *registry_name)? + } + }; - Ok(registry_url) + Ok(registry_index) } fn short_name(registry: &Url) -> String { From 1c986a642632fc531c8215c56430819ac6d3324a Mon Sep 17 00:00:00 2001 From: Chris Moore <35407569+csm123199@users.noreply.github.com> Date: Sun, 13 Dec 2020 01:49:29 -0600 Subject: [PATCH 3/5] restore public API as deprecated; associate floating funcs --- src/bin/add/main.rs | 8 +- src/bin/upgrade/main.rs | 11 +- src/fetch.rs | 13 +- src/lib.rs | 2 +- src/registry.rs | 326 ++++++++++++++++++++++------------------ 5 files changed, 200 insertions(+), 160 deletions(-) diff --git a/src/bin/add/main.rs b/src/bin/add/main.rs index 6288660bad..a2bc86f559 100644 --- a/src/bin/add/main.rs +++ b/src/bin/add/main.rs @@ -16,8 +16,7 @@ extern crate error_chain; use crate::args::{Args, Command}; use cargo_edit::{ - find, manifest_from_pkgid, registry_url, update_registry_index, Dependency, Manifest, - RegistryReq, + find, manifest_from_pkgid, update_registry_index, Dependency, Manifest, RegistryReq, }; use std::borrow::Cow; use std::io::Write; @@ -125,10 +124,11 @@ fn handle_add(args: &Args) -> Result<()> { let deps = &args.parse_dependencies()?; if !args.offline && std::env::var("CARGO_IS_TEST").is_err() { - let url = registry_url(&RegistryReq::project( + let url = RegistryReq::project( args.registry.as_ref().map(String::as_ref), &find(&manifest_path)?, - ))?; + ) + .index_url()?; update_registry_index(&url)?; } diff --git a/src/bin/upgrade/main.rs b/src/bin/upgrade/main.rs index 24ffaa6507..e44cc57147 100644 --- a/src/bin/upgrade/main.rs +++ b/src/bin/upgrade/main.rs @@ -16,8 +16,8 @@ extern crate error_chain; use crate::errors::*; use cargo_edit::{ - find, get_latest_dependency, manifest_from_pkgid, registry_url, update_registry_index, - CrateName, Dependency, LocalManifest, RegistryReq, + find, get_latest_dependency, manifest_from_pkgid, update_registry_index, CrateName, Dependency, + LocalManifest, RegistryIndex, RegistryReq, }; use failure::Fail; use std::collections::{HashMap, HashSet}; @@ -474,7 +474,7 @@ fn process(args: Args) -> Result<()> { if !args.offline && !to_lockfile && std::env::var("CARGO_IS_TEST").is_err() { // get the project's crates.io registry URL - let url = registry_url(&RegistryReq::project(None, &find(&manifest_path)?))?; + let url = RegistryReq::project(None, &find(&manifest_path)?).index_url()?; update_registry_index(&url)?; } @@ -500,9 +500,8 @@ fn process(args: Args) -> Result<()> { .filter_map(|UpgradeMetadata { registry, .. }| registry.as_ref()) .collect::>() { - update_registry_index(&Url::parse(registry_url).map_err(|_| { - ErrorKind::CargoEditLib(::cargo_edit::ErrorKind::InvalidCargoConfig) - })?)?; + let registry_url = RegistryIndex::parse(registry_url)?; + update_registry_index(®istry_url)?; } } diff --git a/src/fetch.rs b/src/fetch.rs index 4687cdaad8..1ca8d1bbdb 100644 --- a/src/fetch.rs +++ b/src/fetch.rs @@ -1,5 +1,5 @@ use crate::errors::*; -use crate::registry::{registry_path, registry_path_from_url, RegistryReq}; +use crate::registry::{RegistryIndex, RegistryReq}; use crate::{Dependency, Manifest}; use regex::Regex; use std::env; @@ -7,7 +7,6 @@ use std::io::Write; use std::path::{Path, PathBuf}; use std::time::Duration; use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, WriteColor}; -use url::Url; #[derive(Deserialize)] struct CrateVersion { @@ -52,7 +51,7 @@ pub fn get_latest_dependency( return Err(ErrorKind::EmptyCrateName.into()); } - let registry_cache = registry_path(®istry)?; + let registry_cache = registry.index_url()?.cache_path()?; let crate_versions = fuzzy_query_registry_index(crate_name, ®istry_cache)?; @@ -88,8 +87,8 @@ fn read_latest_version( } /// update registry index for given project -pub fn update_registry_index(registry: &Url) -> Result<()> { - let registry_path = registry_path_from_url(registry)?; +pub fn update_registry_index(registry: &RegistryIndex) -> Result<()> { + let registry_path = registry.cache_path()?; let colorchoice = if atty::is(atty::Stream::Stdout) { ColorChoice::Auto @@ -99,6 +98,7 @@ pub fn update_registry_index(registry: &Url) -> Result<()> { let mut output = StandardStream::stdout(colorchoice); if !registry_path.as_path().exists() { + // make new bare git repo at registry_path output.set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_bold(true))?; write!(output, "{:>12}", "Initializing")?; output.reset()?; @@ -110,6 +110,7 @@ pub fn update_registry_index(registry: &Url) -> Result<()> { return Ok(()); } + // use existing git repo at registry_path let repo = git2::Repository::open(®istry_path)?; output.set_color(ColorSpec::new().set_fg(Some(Color::Green)).set_bold(true))?; write!(output, "{:>12}", "Updating")?; @@ -120,7 +121,7 @@ pub fn update_registry_index(registry: &Url) -> Result<()> { "refs/heads/{0}:refs/remotes/origin/{0}", get_checkout_name(registry_path)? ); - fetch_with_cli(&repo, registry.as_str(), &refspec)?; + fetch_with_cli(&repo, registry.as_ref().as_str(), &refspec)?; Ok(()) } diff --git a/src/lib.rs b/src/lib.rs index 8a87c1441a..442dccdce5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -35,4 +35,4 @@ pub use crate::fetch::{ }; pub use crate::manifest::{find, LocalManifest, Manifest}; pub use crate::metadata::manifest_from_pkgid; -pub use crate::registry::{registry_url, RegistryReq}; +pub use crate::registry::{RegistryIndex, RegistryReq}; diff --git a/src/registry.rs b/src/registry.rs index 03b7ce13c1..e7141e4e12 100644 --- a/src/registry.rs +++ b/src/registry.rs @@ -7,17 +7,16 @@ use url::Url; const CRATES_IO_INDEX: &str = "https://github.com/rust-lang/crates.io-index"; const CRATES_IO_REGISTRY: &str = "crates-io"; -/// Returns the filesystem path containing the cache for the specified registry (or `crates.io` if `None`). -/// The provided `manifest_path` is used to resolve custom registries provided in `registry_name` -pub fn registry_path(request: &RegistryReq) -> Result { - registry_path_from_url(®istry_url(request)?) +#[deprecated = "create a RegistryReq::Project and use .index_url()?.cache_path()?"] +pub fn registry_path(manifest_path: &Path, registry: Option<&str>) -> Result { + Ok(RegistryReq::project(registry, manifest_path) + .index_url()? + .cache_path()?) } +#[deprecated = "create a RegistryIndex can use .cache_path()?"] pub fn registry_path_from_url(registry: &Url) -> Result { - Ok(cargo_home()? - .join("registry") - .join("index") - .join(short_name(registry))) + RegistryIndex(registry.clone()).cache_path() } #[derive(Debug, Deserialize)] @@ -44,9 +43,64 @@ struct CargoConfig { #[derive(Debug, Clone, PartialEq, Eq)] pub struct RegistryIndex(Url); impl RegistryIndex { - /// Returns the internal short-name of the registry + /// Attempts to parse a RegistryIndex as a URL from a string. + /// + /// Returns an InvalidCargoConfig error if the URL is invalid. + pub fn parse(s: &str) -> Result { + Url::parse(s) + .map(RegistryIndex) + .chain_err(|| ErrorKind::InvalidCargoConfig) + } + + /// Returns the local filesystem path containing the registry's cached crates + pub fn cache_path(&self) -> Result { + Ok(cargo_home()? + .join("registry") + .join("index") + .join(self.short_name())) + } + + /// Returns the cargo-internal short-name of the registry pub fn short_name(&self) -> String { - short_name(&self.0) + // ref: https://github.com/rust-lang/cargo/blob/4c1fa54d10f58d69ac9ff55be68e1b1c25ecb816/src/cargo/sources/registry/mod.rs#L386-L390 + #![allow(deprecated)] + use std::hash::{Hash, Hasher, SipHasher}; + + let mut hasher = SipHasher::new(); + Kind::Registry.hash(&mut hasher); + self.0.as_str().hash(&mut hasher); + let hash = hex::encode(hasher.finish().to_le_bytes()); + + let ident = self.0.host_str().unwrap_or("").to_string(); + + format!("{}-{}", ident, hash) + } +} +impl std::fmt::Display for RegistryIndex { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + // just passthrough to Url's Display impl + std::fmt::Display::fmt(&self.0, f) + } +} +impl Default for RegistryIndex { + /// Returns the index for `crates.io` + fn default() -> Self { + RegistryIndex::parse(CRATES_IO_INDEX).unwrap() + } +} +impl AsRef for RegistryIndex { + fn as_ref(&self) -> &Url { + &self.0 + } +} +impl From for RegistryIndex { + fn from(url: Url) -> RegistryIndex { + RegistryIndex(url) + } +} +impl From for Url { + fn from(ri: RegistryIndex) -> Url { + ri.0 } } @@ -104,19 +158,122 @@ impl<'a> RegistryReq<'a> { } } - /// Resolves the registry's index URL - pub fn index(&self) -> Result { - // check environment variable + /// Find the URL of a registry. Defaults to crates.io if no registry is provided. + /// + /// Uses a project's/user's cargo config files to resolve the registry to a URL. + pub fn index_url(&self) -> Result { + // TODO support local registry sources, directory sources, git sources: https://doc.rust-lang.org/cargo/reference/source-replacement.html?highlight=replace-with#source-replacement + + /// Takes the registries/sources from the specified cargo config toml file, and adds them to the HashMap + /// If there is a conflict, then the existing value is favored. + fn merge_cfg( + registries: &mut HashMap, + path: impl AsRef, + ) -> Result<()> { + // TODO unit test for source replacement + let content = std::fs::read_to_string(path)?; + let config = toml::from_str::(&content) + .map_err(|_| ErrorKind::InvalidCargoConfig)?; + + for (key, value) in config.registries { + // favor previous values + registries.entry(key).or_insert(Source { + registry: value.index, + replace_with: None, + }); + } + for (key, value) in config.source { + // favor previous values + registries.entry(key).or_insert(value); + } + Ok(()) + } + + // TODO implement support for registries specified via environment variables // ref: https://doc.rust-lang.org/cargo/reference/registries.html#using-an-alternate-registry - // Can't find environment variable checking in cargo? - // check cargo configs for `registries` entries + fn merge_user_config(registries: &mut HashMap) -> Result<()> { + // look at the user's global cargo config + if let Some(user_config) = user_cargo_config()? { + merge_cfg(registries, user_config)?; + } - // check default cargo + Ok(()) + } - // fallback to cargo? None? + fn lookup_registry( + registries: &mut HashMap, + registry_name: Option<&str>, + ) -> Result { + //TODO: change impl to do simple lookups instead of removes? (then we don't have to mutate the lookup table -> lookups can be tested easier) - registry_url(self).map(RegistryIndex) + // find head of the relevant linked list + let mut source = match registry_name { + Some(CRATES_IO_INDEX) | None => registries + .remove(CRATES_IO_REGISTRY) + .unwrap_or_else(|| Source { + replace_with: None, + registry: Some(CRATES_IO_INDEX.to_string()), + }), + Some(r) => registries + .remove(r) + .chain_err(|| ErrorKind::NoSuchRegistryFound(r.to_string()))?, + }; + + // search this linked list and find the tail + while let Some(replace_with) = &source.replace_with { + source = registries + .remove(replace_with) + .chain_err(|| ErrorKind::NoSuchSourceFound(replace_with.to_string()))?; + } + + let registry_url = source + .registry + .and_then(|x| Url::parse(&x).ok()) + .chain_err(|| ErrorKind::InvalidCargoConfig)?; + + Ok(registry_url) + } + + // registry might be replaced with another source + // it's looks like a singly linked list + // put relations in this map. + let mut registries: HashMap = HashMap::new(); + + let registry_index: Url = match self { + RegistryReq::Custom { index } => { + // We were already given a bare index URL - return that + index.0.clone() + } + RegistryReq::User { registry_name } => { + // Lookup a URL based on global user config + merge_user_config(&mut registries)?; + + lookup_registry(&mut registries, *registry_name)? + } + RegistryReq::Project { + registry_name, + manifest_dir, + } => { + // only use a project's registry configurations, if they exist + project_cargo_configs(manifest_dir)? + .iter() + .try_for_each(|config_path| merge_cfg(&mut registries, config_path))?; + + merge_user_config(&mut registries)?; + + lookup_registry(&mut registries, *registry_name)? + } + }; + + Ok(RegistryIndex(registry_index)) + } + + /// Returns the filesystem path containing the cache for the specified registry (or `crates.io` if `None`). + /// The provided `manifest_path` is used to resolve custom registries provided in `registry_name` + #[deprecated = "call `.index_url()?.cache_path()?` instead"] + pub fn cache_path(request: &RegistryReq) -> Result { + Ok(request.index_url()?.cache_path()?) } } @@ -184,140 +341,23 @@ fn user_cargo_config() -> Result> { cargo_home().map(get_dir_config) } -/// Find the URL of a registry. Defaults to crates.io if no registry is provided. -/// -/// Uses a project's/user's cargo config files to resolve the registry to a URL. -pub fn registry_url(request: &RegistryReq) -> Result { - // TODO support local registry sources, directory sources, git sources: https://doc.rust-lang.org/cargo/reference/source-replacement.html?highlight=replace-with#source-replacement - - /// Takes the registries/sources from the specified cargo config toml file, and adds them to the HashMap - /// If there is a conflict, then the existing value is favored. - fn merge_cfg(registries: &mut HashMap, path: impl AsRef) -> Result<()> { - // TODO unit test for source replacement - let content = std::fs::read_to_string(path)?; - let config = - toml::from_str::(&content).map_err(|_| ErrorKind::InvalidCargoConfig)?; - - for (key, value) in config.registries { - // favor previous values - registries.entry(key).or_insert(Source { - registry: value.index, - replace_with: None, - }); - } - for (key, value) in config.source { - // favor previous values - registries.entry(key).or_insert(value); - } - Ok(()) - } - - // TODO implement support for registries specified via environment variables - // ref: https://doc.rust-lang.org/cargo/reference/registries.html#using-an-alternate-registry - - fn merge_user_config(registries: &mut HashMap) -> Result<()> { - // look at the user's global cargo config - if let Some(user_config) = user_cargo_config()? { - merge_cfg(registries, user_config)?; - } - - Ok(()) - } - - fn lookup_registry( - registries: &mut HashMap, - registry_name: Option<&str>, - ) -> Result { - //TODO: change impl to do simple lookups instead of removes? (then we don't have to mutate the lookup table -> lookups can be tested easier) - - // find head of the relevant linked list - let mut source = - match registry_name { - Some(CRATES_IO_INDEX) | None => registries - .remove(CRATES_IO_REGISTRY) - .unwrap_or_else(|| Source { - replace_with: None, - registry: Some(CRATES_IO_INDEX.to_string()), - }), - Some(r) => registries - .remove(r) - .chain_err(|| ErrorKind::NoSuchRegistryFound(r.to_string()))?, - }; - - // search this linked list and find the tail - while let Some(replace_with) = &source.replace_with { - source = registries - .remove(replace_with) - .chain_err(|| ErrorKind::NoSuchSourceFound(replace_with.to_string()))?; - } - - let registry_url = source - .registry - .and_then(|x| Url::parse(&x).ok()) - .chain_err(|| ErrorKind::InvalidCargoConfig)?; - - Ok(registry_url) - } - - // registry might be replaced with another source - // it's looks like a singly linked list - // put relations in this map. - let mut registries: HashMap = HashMap::new(); - - let registry_index: Url = match request { - RegistryReq::Custom { index } => { - // We were already given a bare index URL - return that - index.0.clone() - } - RegistryReq::User { registry_name } => { - // Lookup a URL based on global user config - merge_user_config(&mut registries)?; - - lookup_registry(&mut registries, *registry_name)? - } - RegistryReq::Project { - registry_name, - manifest_dir, - } => { - // only use a project's registry configurations, if they exist - project_cargo_configs(manifest_dir)? - .iter() - .try_for_each(|config_path| merge_cfg(&mut registries, config_path))?; - - merge_user_config(&mut registries)?; - - lookup_registry(&mut registries, *registry_name)? - } - }; - - Ok(registry_index) +#[deprecated = "create a RegistryReq and call .index_url()? on it"] +pub fn registry_url(manifest_path: &Path, registry: Option<&str>) -> Result { + Ok(RegistryReq::project(registry, manifest_path).index_url()?.0) } +#[deprecated = "use RegistryIndex::short_name()"] fn short_name(registry: &Url) -> String { - // ref: https://github.com/rust-lang/cargo/blob/4c1fa54d10f58d69ac9ff55be68e1b1c25ecb816/src/cargo/sources/registry/mod.rs#L386-L390 - #![allow(deprecated)] - use std::hash::{Hash, Hasher, SipHasher}; - - let mut hasher = SipHasher::new(); - Kind::Registry.hash(&mut hasher); - registry.as_str().hash(&mut hasher); - let hash = hex::encode(hasher.finish().to_le_bytes()); - - let ident = registry.host_str().unwrap_or("").to_string(); - - format!("{}-{}", ident, hash) + RegistryIndex(registry.clone()).short_name() } #[cfg_attr(target_pointer_width = "64", test)] fn test_short_name() { fn test_helper(url: &str, name: &str) { - let url = Url::parse(url).unwrap(); - assert_eq!(short_name(&url), name); + let url = RegistryIndex::parse(url).unwrap(); + assert_eq!(url.short_name(), name); } - test_helper( - "https://github.com/rust-lang/crates.io-index", - "github.com-1ecc6299db9ec823", - ); + test_helper(CRATES_IO_INDEX, "github.com-1ecc6299db9ec823"); } mod code_from_cargo { From 933ebfeb687dad09d020c8853875bca6be913c12 Mon Sep 17 00:00:00 2001 From: Chris Moore <35407569+csm123199@users.noreply.github.com> Date: Sun, 13 Dec 2020 01:51:27 -0600 Subject: [PATCH 4/5] fix tests when target dir is not CWD or available via CARGO_TARGET_DIR --- tests/cargo-add.rs | 2 +- tests/utils.rs | 27 +++++++++++---------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/tests/cargo-add.rs b/tests/cargo-add.rs index db309c51b2..83a9f369c3 100644 --- a/tests/cargo-add.rs +++ b/tests/cargo-add.rs @@ -1534,7 +1534,7 @@ fn add_prints_message_for_features_deps() { let (_tmpdir, manifest) = clone_out_test("tests/fixtures/add/Cargo.toml.sample"); assert_cli::Assert::command(&[ - "target/debug/cargo-add", + utils::EXE_PATH_ADD, "add", "hello-world", "--vers", diff --git a/tests/utils.rs b/tests/utils.rs index eb6e7a9f01..01fdd99b71 100644 --- a/tests/utils.rs +++ b/tests/utils.rs @@ -3,6 +3,10 @@ use std::ffi::{OsStr, OsString}; use std::io::prelude::*; use std::{env, fs, path::Path, path::PathBuf, process}; +pub const EXE_PATH_ADD: &'static str = env!("CARGO_BIN_EXE_cargo-add"); +pub const EXE_PATH_RM: &'static str = env!("CARGO_BIN_EXE_cargo-rm"); +pub const EXE_PATH_UPGRADE: &'static str = env!("CARGO_BIN_EXE_cargo-upgrade"); + /// Helper function that copies the workspace test into a temporary directory. pub fn copy_workspace_test() -> (tempfile::TempDir, String, Vec) { // Create a temporary directory and copy in the root manifest, the dummy rust file, and @@ -190,20 +194,11 @@ pub fn get_toml(manifest_path: &str) -> toml_edit::Document { } pub fn get_command_path(s: impl AsRef) -> String { - let target_dir: PathBuf = match env::var_os("CARGO_TARGET_DIR") { - Some(dir) => dir.into(), - None => env::current_dir() - .expect("Failed to get current dir") - .join("target"), - }; - - let mut binary_name = OsString::from("cargo-"); - binary_name.push(s.as_ref()); - - target_dir - .join("debug") - .join(binary_name) - .to_str() - .unwrap() - .to_string() + // would probably be better to replace all calls to get_command_path, but this reduces the diff + match s.as_ref().to_string_lossy().as_ref() { + "add" => EXE_PATH_ADD.into(), + "rm" => EXE_PATH_RM.into(), + "upgrade" => EXE_PATH_UPGRADE.into(), + _ => panic!("unexpected command {}", s.as_ref().to_string_lossy()), + } } From e01ae958ed7ab8a150270440c39bff5e2876618e Mon Sep 17 00:00:00 2001 From: Chris Moore Date: Sun, 10 Dec 2023 16:11:33 -0600 Subject: [PATCH 5/5] update deps + associated build errors --- Cargo.lock | 1473 ++++++++++++++++++++++++++------------- Cargo.toml | 32 +- src/bin/add/main.rs | 2 +- src/bin/rm/main.rs | 2 +- src/bin/upgrade/main.rs | 2 +- src/fetch.rs | 39 +- src/manifest.rs | 5 +- 7 files changed, 1026 insertions(+), 529 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0694aeadb7..0ab162e051 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,25 +1,27 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "addr2line" -version = "0.14.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] [[package]] name = "adler" -version = "0.2.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.14" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -30,26 +32,17 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "ascii" -version = "0.9.3" +name = "ansi_term" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] [[package]] name = "assert_cli" @@ -71,25 +64,26 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.54" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", - "cfg-if 1.0.0", + "cc", + "cfg-if", "libc", "miniz_oxide", "object", @@ -98,48 +92,46 @@ dependencies = [ [[package]] name = "base64" -version = "0.12.3" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] -name = "base64" -version = "0.13.0" +name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "1.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] -name = "blake2b_simd" -version = "0.5.10" +name = "bumpalo" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] -name = "bumpalo" -version = "3.4.0" +name = "bytes" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] -name = "byteorder" -version = "1.3.4" +name = "camino" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +dependencies = [ + "serde", +] [[package]] name = "cargo-edit" -version = "0.7.0" +version = "0.7.1" dependencies = [ "assert_cli", "atty", @@ -152,7 +144,8 @@ dependencies = [ "hex", "pretty_assertions", "regex", - "semver", + "reqwest", + "semver 0.11.0", "serde", "serde_derive", "serde_json", @@ -162,70 +155,57 @@ dependencies = [ "termcolor", "toml", "toml_edit", - "ureq", "url", ] +[[package]] +name = "cargo-platform" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" +dependencies = [ + "serde", +] + [[package]] name = "cargo_metadata" -version = "0.12.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5a5f7b42f606b7f23674f6f4d877628350682bc40687d3fae65679a58d55345" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ - "semver", + "camino", + "cargo-platform", + "semver 1.0.20", "serde", "serde_json", + "thiserror", ] [[package]] name = "cc" -version = "1.0.61" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" -dependencies = [ - "libc", - "num-integer", - "num-traits", - "time", - "winapi 0.3.9", -] - -[[package]] -name = "chunked_transfer" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7477065d45a8fe57167bf3cf8bcd3729b54cfcb81cca49bda2d038ea89ae82ca" - [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "ansi_term", + "ansi_term 0.12.1", "atty", - "bitflags", + "bitflags 1.3.2", "strsim", "textwrap", "unicode-width", @@ -234,53 +214,39 @@ dependencies = [ [[package]] name = "colored" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" +checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi 0.3.9", + "winapi", ] [[package]] -name = "combine" -version = "3.8.1" +name = "core-foundation" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "ascii", - "byteorder", - "either", - "memchr", - "unreachable", + "core-foundation-sys", + "libc", ] [[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" +name = "core-foundation-sys" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "ctor" -version = "0.1.16" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -291,29 +257,32 @@ checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" [[package]] name = "dirs" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] -name = "either" -version = "1.6.1" +name = "encoding_rs" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] [[package]] name = "env_proxy" @@ -331,6 +300,22 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f4b14e20978669064c33b4c1e0fb4083412e40fe56cbea2eae80fd7591503ee" +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "error-chain" version = "0.12.4" @@ -359,34 +344,118 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-core", + "futures-io", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "getrandom" -version = "0.1.15" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "gimli" -version = "0.23.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "git2" -version = "0.13.12" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6f1a0238d7f8f8fd5ee642f4ebac4dbc03e03d1f78fbe7a3ede35dcf7e2224" +checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" dependencies = [ - "bitflags", + "bitflags 2.4.1", "libc", "libgit2-sys", "log", @@ -395,61 +464,189 @@ dependencies = [ "url", ] +[[package]] +name = "h2" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + [[package]] name = "heck" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] [[package]] name = "hermit-abi" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + [[package]] name = "hex" -version = "0.4.2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.10", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] [[package]] name = "idna" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.3", + "rustix", + "windows-sys 0.48.0", +] + [[package]] name = "itoa" -version = "0.4.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.21" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.45" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -462,15 +659,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.80" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libgit2-sys" -version = "0.12.14+1.1.0" +version = "0.16.1+1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f25af58e6495f7caf2919d08f212de550cfa3ed2f5e744988938ea292b9f549" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" dependencies = [ "cc", "libc", @@ -480,11 +677,22 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + [[package]] name = "libssh2-sys" -version = "0.2.19" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056" +checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" dependencies = [ "cc", "libc", @@ -496,9 +704,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.2" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -507,86 +715,130 @@ dependencies = [ ] [[package]] -name = "linked-hash-map" -version = "0.5.3" +name = "linux-raw-sys" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "log" -version = "0.4.11" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" -dependencies = [ - "cfg-if 0.1.10", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] -name = "matches" -version = "0.1.8" +name = "memchr" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] -name = "memchr" -version = "2.3.4" +name = "mime" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.4.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", - "autocfg", ] [[package]] -name = "num-integer" -version = "0.1.44" +name = "mio" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ - "autocfg", - "num-traits", + "libc", + "wasi", + "windows-sys 0.48.0", ] [[package]] -name = "num-traits" -version = "0.2.14" +name = "native-tls" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ - "autocfg", + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.3", + "libc", ] [[package]] name = "object" -version = "0.22.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] [[package]] name = "once_cell" -version = "1.4.1" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl" +version = "0.10.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] [[package]] name = "openssl-probe" -version = "0.1.2" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.58" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -595,39 +847,47 @@ dependencies = [ [[package]] name = "output_vt100" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.1.3" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ + "memchr", + "thiserror", "ucd-trie", ] [[package]] -name = "pkg-config" -version = "0.3.19" +name = "pin-project-lite" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] -name = "ppv-lite86" -version = "0.2.9" +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "pretty_assertions" @@ -635,7 +895,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427" dependencies = [ - "ansi_term", + "ansi_term 0.11.0", "ctor", "difference", "output_vt100", @@ -650,7 +910,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -667,176 +927,164 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] -name = "qstring" -version = "0.7.2" +name = "quote" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "percent-encoding", + "proc-macro2", ] [[package]] -name = "quote" -version = "1.0.7" +name = "redox_syscall" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "proc-macro2", + "bitflags 1.3.2", ] [[package]] -name = "rand" -version = "0.7.3" +name = "redox_users" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", + "libredox", + "thiserror", ] [[package]] -name = "rand_chacha" -version = "0.2.2" +name = "regex" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ - "ppv-lite86", - "rand_core", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom", - "redox_syscall", - "rust-argon2", -] - -[[package]] -name = "regex" -version = "1.4.1" +name = "regex-automata" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] name = "regex-syntax" -version = "0.6.20" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "reqwest" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "winapi 0.3.9", + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", ] [[package]] -name = "ring" -version = "0.16.15" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "952cd6b98c85bbc30efa1ba5783b8abf12fec8b3287ffa52605b9432313e34e4" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi 0.3.9", -] +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] -name = "rust-argon2" -version = "0.8.2" +name = "rustix" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "base64 0.12.3", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] -name = "rustc-demangle" -version = "0.1.18" +name = "ryu" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] -name = "rustls" -version = "0.18.1" +name = "schannel" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "base64 0.12.3", - "log", - "ring", - "sct", - "webpki", + "windows-sys 0.48.0", ] [[package]] -name = "ryu" -version = "1.0.5" +name = "security-framework" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] [[package]] -name = "sct" -version = "0.6.0" +name = "security-framework-sys" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ - "ring", - "untrusted", + "core-foundation-sys", + "libc", ] [[package]] @@ -849,40 +1097,49 @@ dependencies = [ "serde", ] +[[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +dependencies = [ + "serde", +] + [[package]] name = "semver-parser" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ef146c2ad5e5f4b037cd6ce2ebb775401729b19a82040c1beac9d36c7d1428" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" dependencies = [ "pest", ] [[package]] name = "serde" -version = "1.0.117" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.117" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.59" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -890,22 +1147,54 @@ dependencies = [ ] [[package]] -name = "socks" -version = "0.3.2" +name = "serde_spanned" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a64cfa9346d26e836a49fcc1ddfcb4d3df666b6787b6864db61d4918e1cbc2" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ - "byteorder", "libc", - "winapi 0.2.8", - "ws2_32-sys", + "winapi", ] [[package]] -name = "spin" -version = "0.5.2" +name = "socket2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] [[package]] name = "strsim" @@ -915,9 +1204,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.20" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126d630294ec449fae0b16f964e35bf3c74f940da9dca17ee9b905f7b3112eb8" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" dependencies = [ "clap", "lazy_static", @@ -926,69 +1215,100 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.13" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e51c492f9e23a220534971ff5afc14037289de430e3c83f9daf6a1b6ae91e8" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "subprocess" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b9ad6c3e1b525a55872a4d2f2d404b3c959b7bbcbfd83c364580f68ed157bd" +checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] name = "syn" -version = "1.0.48" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] name = "synstructure" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] [[package]] -name = "tempfile" -version = "3.1.0" +name = "system-configuration" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "cfg-if 0.1.10", + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", "libc", - "rand", +] + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand", "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", + "rustix", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -1003,144 +1323,206 @@ dependencies = [ ] [[package]] -name = "thread_local" -version = "1.0.1" +name = "thiserror" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ - "lazy_static", + "thiserror-impl", ] [[package]] -name = "time" -version = "0.1.44" +name = "thiserror-impl" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] name = "tinyvec" -version = "0.3.4" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2 0.5.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] [[package]] name = "toml" -version = "0.5.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.2.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09391a441b373597cf0888d2b052dcf82c5be4fee05da3636ae30fb57aad8484" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "chrono", - "combine", - "linked-hash-map", + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] -name = "ucd-trie" -version = "0.1.3" +name = "tower-service" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] -name = "unicode-bidi" -version = "0.3.4" +name = "tracing" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "matches", + "pin-project-lite", + "tracing-core", ] [[package]] -name = "unicode-normalization" -version = "0.1.13" +name = "tracing-core" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ - "tinyvec", + "once_cell", ] [[package]] -name = "unicode-segmentation" -version = "1.6.0" +name = "try-lock" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] -name = "unicode-width" -version = "0.1.8" +name = "ucd-trie" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] -name = "unicode-xid" -version = "0.2.1" +name = "unicode-bidi" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] -name = "unreachable" -version = "1.0.0" +name = "unicode-ident" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ - "void", + "tinyvec", ] [[package]] -name = "untrusted" -version = "0.7.1" +name = "unicode-segmentation" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] -name = "ureq" -version = "1.5.1" +name = "unicode-width" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed21e32e4e3ff89891022affaa7091c3a164d5049cb3872f1cf0fd6ccd9fc8f7" -dependencies = [ - "base64 0.13.0", - "chunked_transfer", - "log", - "once_cell", - "qstring", - "rustls", - "serde", - "serde_json", - "socks", - "url", - "webpki", - "webpki-roots", -] +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "url" -version = "2.1.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ + "form_urlencoded", "idna", - "matches", "percent-encoding", ] [[package]] name = "vcpkg" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vec_map" @@ -1150,58 +1532,67 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" - -[[package]] -name = "void" -version = "1.0.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +name = "want" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.68" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.68" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.39", "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" -version = "0.2.68" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1209,101 +1600,211 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.68" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.68" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-sys" -version = "0.3.45" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.21.3" +name = "winapi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab146130f5f790d45f82aeeb09e55a256573373ec64409fc19a6fb82fb1032ae" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ - "ring", - "untrusted", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] -name = "webpki-roots" -version = "0.20.0" +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ - "webpki", + "winapi", ] [[package]] -name = "winapi" -version = "0.2.8" +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "winapi" -version = "0.3.9" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-targets 0.48.5", ] [[package]] -name = "winapi-build" -version = "0.1.1" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] [[package]] -name = "winapi-util" -version = "0.1.5" +name = "windows-targets" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" dependencies = [ - "winapi 0.3.9", + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows_aarch64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" +dependencies = [ + "memchr", +] [[package]] -name = "ws2_32-sys" -version = "0.2.1" +name = "winreg" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "cfg-if", + "windows-sys 0.48.0", ] diff --git a/Cargo.toml b/Cargo.toml index 6a38f7fe2e..0af148ea2c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ license = "Apache-2.0/MIT" name = "cargo-edit" readme = "README.md" repository = "https://github.com/killercup/cargo-edit" -version = "0.7.0" +version = "0.7.1" edition = "2018" [[bin]] @@ -51,24 +51,24 @@ repository = "killercup/cargo-edit" [dependencies] atty = { version = "0.2.14", optional = true } -cargo_metadata = "0.12.0" -dirs = "3.0.1" +cargo_metadata = "0.18.1" +dirs = "3.0.2" env_proxy = "0.4.1" error-chain = "0.12.4" failure = "0.1.8" -git2 = "0.13.11" -hex = "0.4.2" -regex = "1.3.9" -serde = "1.0.116" -serde_derive = "1.0.116" -serde_json = "1.0.58" -structopt = { version = "0.3.18", optional = true } -subprocess = "0.2.6" -termcolor = "1.1.0" -toml = "0.5.6" -toml_edit = "0.2.0" -url = "2.1.1" -ureq = { version = "1.5.1", default-features = false, features = ["tls", "json", "socks"] } +git2 = "0.18.1" +hex = "0.4.3" +regex = "1.10.2" +serde = "1.0.193" +serde_derive = "1.0.193" +serde_json = "1.0.108" +structopt = { version = "0.3.26", optional = true } +subprocess = "0.2.9" +termcolor = "1.4.0" +toml = "0.8.8" +toml_edit = "0.21.0" +url = "2.5.0" +reqwest = { version = "0.11.22", features = ["blocking"] } [dependencies.semver] features = ["serde"] diff --git a/src/bin/add/main.rs b/src/bin/add/main.rs index a2bc86f559..f6024a9478 100644 --- a/src/bin/add/main.rs +++ b/src/bin/add/main.rs @@ -116,7 +116,7 @@ fn is_sorted(mut it: impl Iterator) -> bool { fn handle_add(args: &Args) -> Result<()> { let manifest_path = if let Some(ref pkgid) = args.pkgid { let pkg = manifest_from_pkgid(pkgid)?; - Cow::Owned(Some(pkg.manifest_path)) + Cow::Owned(Some(pkg.manifest_path.into_std_path_buf())) } else { Cow::Borrowed(&args.manifest_path) }; diff --git a/src/bin/rm/main.rs b/src/bin/rm/main.rs index 3feb89f472..41704dc804 100644 --- a/src/bin/rm/main.rs +++ b/src/bin/rm/main.rs @@ -104,7 +104,7 @@ fn print_msg(name: &str, section: &str) -> Result<()> { fn handle_rm(args: &Args) -> Result<()> { let manifest_path = if let Some(ref pkgid) = args.pkgid { let pkg = manifest_from_pkgid(pkgid)?; - Cow::Owned(Some(pkg.manifest_path)) + Cow::Owned(Some(pkg.manifest_path.into_std_path_buf())) } else { Cow::Borrowed(&args.manifest_path) }; diff --git a/src/bin/upgrade/main.rs b/src/bin/upgrade/main.rs index e44cc57147..ab87ca3b18 100644 --- a/src/bin/upgrade/main.rs +++ b/src/bin/upgrade/main.rs @@ -212,7 +212,7 @@ impl Manifests { let packages = result.packages; let package = packages .iter() - .find(|p| p.manifest_path.to_string_lossy() == resolved_manifest_path) + .find(|p| p.manifest_path.as_str() == resolved_manifest_path) // If we have successfully got metadata, but our manifest path does not correspond to a // package, we must have been called against a virtual manifest. .chain_err(|| { diff --git a/src/fetch.rs b/src/fetch.rs index 1ca8d1bbdb..80f993d166 100644 --- a/src/fetch.rs +++ b/src/fetch.rs @@ -2,6 +2,7 @@ use crate::errors::*; use crate::registry::{RegistryIndex, RegistryReq}; use crate::{Dependency, Manifest}; use regex::Regex; +use reqwest::Proxy; use std::env; use std::io::Write; use std::path::{Path, PathBuf}; @@ -395,29 +396,23 @@ fn get_name_from_manifest(manifest: &Manifest) -> Result { } fn get_cargo_toml_from_git_url(url: &str) -> Result { - let mut req = ureq::get(url); - req.timeout(get_default_timeout()); - if let Some(proxy) = env_proxy::for_url_str(url) - .to_url() - .and_then(|url| ureq::Proxy::new(url).ok()) - { - req.set_proxy(proxy); - } - let res = req.call(); - if res.error() { - return Err(format!( - "HTTP request `{}` failed: {}", - url, - res.synthetic_error() - .as_ref() - .map(|x| x.to_string()) - .unwrap_or_else(|| res.status().to_string()) - ) - .into()); + let mut clientb = reqwest::blocking::Client::builder(); + clientb = clientb.timeout(get_default_timeout()); + clientb = clientb.proxy(Proxy::custom(|u| { + env_proxy::for_url(u).to_url() + })); + let client = clientb.build().unwrap(); + + match client.get(url).send().and_then(|r| r.error_for_status()) { + Err(e) => { + Err(format!( + "HTTP request `{}` failed: {}", url, e + ).into()) + }, + Ok(res) => { + res.text().chain_err(|| "Git response not a valid `String`") + } } - - res.into_string() - .chain_err(|| "Git response not a valid `String`") } const fn get_default_timeout() -> Duration { diff --git a/src/manifest.rs b/src/manifest.rs index a37d344f3f..06f0f501ec 100644 --- a/src/manifest.rs +++ b/src/manifest.rs @@ -204,7 +204,7 @@ impl Manifest { } } - descend(&mut self.data.root, table_path) + descend(self.data.as_item_mut(), table_path) } /// Get all sections in the manifest that exist and might contain dependencies. @@ -259,7 +259,8 @@ impl Manifest { } } - let s = self.data.to_string_in_original_order(); + // let s = self.data.to_string_in_original_order(); + let s = self.data.to_string(); let new_contents_bytes = s.as_bytes(); // We need to truncate the file, otherwise the new contents