[beta] backport #5288#5291
Merged
Merged
Conversation
Contributor
Author
|
@bors r+ |
Contributor
|
📌 Commit 6421f08 has been approved by |
Contributor
|
⌛ Testing commit 6421f08dc4d17618a1b01cb090555216506dbcd5 with merge 2405287a61448a11b43d26e16332a8055b4e9370... |
Contributor
|
💔 Test failed - status-travis |
As discussed at the recent work week this is probably a bit too zealous at this time, so let's hold off on it until it's either more stable or we figure out a better way to deal with changes in rustfmt. For now though it'll hopefully be easy to continue running rustfmt every so often!
Discovered in rust-lang#5257 the changes in rust-lang#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 rust-lang#5257
6421f08 to
b9755c0
Compare
Contributor
Author
|
@bors r+ CI failed because of different rustfmt versions. Pulling in the commit that disables rustfmt as well. |
Contributor
|
📌 Commit b9755c0 has been approved by |
Contributor
Contributor
|
☀️ Test successful - status-appveyor, status-travis |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.