From: bors Date: Tue, 3 Apr 2018 23:41:50 +0000 (+0000) Subject: Auto merge of #5288 - alexcrichton:another-fix, r=matklad X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~101 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1d7a0bb5eb31dae998f09c3d5322591e41c30101;p=cargo.git Auto merge of #5288 - alexcrichton:another-fix, r=matklad Less aggressively poison sources on builds Discovered in #5257 the changes in #5215 were slightly too aggressively poisoning sources to require updates, thinking that a manifest changed when it actually hadn't. Non-workspace-member path dependencies with optional/dev-dependencies don't show up in the lock file, so the previous logic would recognize this and think that the dependency missing from the lock file was just added and would require a registry update. The fix in this commit effectively just skips all of these dependencies in non-workspace members. This means that this will be slightly buggy if an optional dependency that's activated is added, but that's hopefully something we can tackle later. Closes #5257 --- 1d7a0bb5eb31dae998f09c3d5322591e41c30101