fix(upgrade): Don't silence network errors

Fixes #924

Author: epage

src/bin/upgrade/upgrade.rs

@@ -5,7 +5,7 @@ use std::path::PathBuf;
 
 use anyhow::Context as _;
 use cargo_edit::{
-    get_compatible_dependency, get_latest_dependency, registry_url, set_dep_version, shell_note,
+    find_compatible_version, find_latest_version, registry_url, set_dep_version, shell_note,
     shell_status, shell_warn, shell_write_stdout, CargoResult, CertsSource, CrateSpec, Dependency,
     IndexCache, LocalManifest, RustVersion, Source,
 };
@@ -290,18 +290,17 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> {
                     // we're offline.
                     let registry_url = registry_url(&manifest_path, dependency.registry())?;
                     let index = index.index(&registry_url)?;
+                    let krate = index.krate(&dependency.name)?;
+                    let versions = krate
+                        .as_ref()
+                        .map(|k| k.versions.as_slice())
+                        .unwrap_or_default();
                     let is_prerelease = old_version_req.contains('-');
 
                     let latest_compatible = VersionReq::parse(&old_version_req)
                         .ok()
                         .and_then(|old_version_req| {
-                            get_compatible_dependency(
-                                &dependency.name,
-                                &old_version_req,
-                                rust_version,
-                                index,
-                            )
-                            .ok()
+                            find_compatible_version(&versions, &old_version_req, rust_version)
                         })
                         .map(|d| {
                             d.version()
@@ -310,13 +309,11 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> {
                         });
 
                     let latest_version =
-                        get_latest_dependency(&dependency.name, is_prerelease, rust_version, index)
-                            .ok()
-                            .map(|d| {
-                                d.version()
-                                    .expect("registry packages always have a version")
-                                    .to_owned()
-                            });
+                        find_latest_version(&versions, is_prerelease, rust_version).map(|d| {
+                            d.version()
+                                .expect("registry packages always have a version")
+                                .to_owned()
+                        });
 
                     let latest_incompatible = if latest_version != latest_compatible {
                         latest_version

src/errors.rs

@@ -66,10 +66,6 @@ impl From<std::io::Error> for CliError {
     }
 }
 
-pub(crate) fn no_crate_err(name: impl Display) -> Error {
-    anyhow::format_err!("The crate `{}` could not be found in registry index.", name)
-}
-
 pub(crate) fn non_existent_table_err(table: impl Display) -> Error {
     anyhow::format_err!("The table `{}` could not be found.", table)
 }