From: bors <bors@rust-lang.org>
Date: Wed, 14 Sep 2016 20:27:39 +0000 (-0700)
Subject: Auto merge of #3092 - jhbabon:fix/dont-panic-on-workspaces, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2~78
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=939922974bc18df2daac055fd1bcb2c2d87d629d;p=cargo.git

Auto merge of #3092 - jhbabon:fix/dont-panic-on-workspaces, r=alexcrichton

FIX: Don't try to generate Gargo.lock on empty workspaces.

There was a `panic!` when the command `cargo update` was executed in a workspace like this:

    mkdir ws
    cd ws
    echo '[workspace]' > Cargo.toml
    cargo new p1
    cargo new p2
    cargo update

The problem is that cargo tries to generate the `Cargo.lock` file even if there aren't any members on the workspace.

This fix checks the existence of members in the workspace before trying to do anything so at least we report an error instead of throwing a `panic!`.

Issue related https://github.com/rust-lang/cargo/issues/3080
---

939922974bc18df2daac055fd1bcb2c2d87d629d