Merge pull request killercup#755 from epage/fixes

fix(upgrade): Resolve problems found in killercup#754

src/bin/upgrade/upgrade.rs

@@ -143,7 +143,7 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> {
     let manifests = args.resolve_targets()?;
     let locked = args
         .to_lockfile
-        .then(|| load_lockfile(&manifests))
+        .then(|| load_lockfile(&manifests, args.offline))
         .transpose()?
         .unwrap_or_default();
 
@@ -186,7 +186,7 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> {
                 let dependency = match Dependency::from_toml(&manifest_path, dep_key, dep_item) {
                     Ok(dependency) => dependency,
                     Err(err) => {
-                        shell_warn(&format!("ignoring {}, invalid entry: {}", dep_key, err))?;
+                        shell_warn(&format!("ignoring {}, unsupported entry: {}", dep_key, err))?;
                         continue;
                     }
                 };
@@ -390,7 +390,10 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> {
     Ok(())
 }
 
-fn load_lockfile(targets: &[cargo_metadata::Package]) -> CargoResult<Vec<cargo_metadata::Package>> {
+fn load_lockfile(
+    targets: &[cargo_metadata::Package],
+    offline: bool,
+) -> CargoResult<Vec<cargo_metadata::Package>> {
     // Get locked dependencies. For workspaces with multiple Cargo.toml
     // files, there is only a single lockfile, so it suffices to get
     // metadata for any one of Cargo.toml files.
@@ -400,15 +403,15 @@ fn load_lockfile(targets: &[cargo_metadata::Package]) -> CargoResult<Vec<cargo_m
     let mut cmd = cargo_metadata::MetadataCommand::new();
     cmd.manifest_path(package.manifest_path.clone());
     cmd.features(cargo_metadata::CargoOpt::AllFeatures);
-    cmd.other_options(vec!["--locked".to_string()]);
+    let mut other = vec!["--locked".to_owned()];
+    if offline {
+        other.push("--offline".to_owned());
+    }
+    cmd.other_options(other);
 
     let result = cmd.exec()?;
 
-    let locked = result
-        .packages
-        .into_iter()
-        .filter(|p| p.source.is_some()) // Source is none for local packages
-        .collect::<Vec<_>>();
+    let locked = result.packages;
 
     Ok(locked)
 }

tests/cargo-upgrade/to_lockfile/out/one/Cargo.toml

@@ -7,4 +7,4 @@ path = "../dummy.rs"
 
 [dependencies]
 my-package = "0.2.3"
-three = { path = "../implicit/three", version = "0.1.0" }
+three = { path = "../implicit/three", version = "0.1.5" }

tests/cargo-upgrade/to_lockfile/stderr.log

@@ -1,6 +1,6 @@
     Checking one's dependencies
    Upgrading my-package: v0.2.0 -> v0.2.3
-warning: ignoring three, could not find package: not in lock file
+   Upgrading three: v0.1.0 -> v0.1.5
     Checking three's dependencies
    Upgrading my-package: v0.2.0 -> v0.2.3
     Checking two's dependencies