Skip to content

[beta] backport #5288#5291

Merged
bors merged 2 commits intorust-lang:rust-1.26.0from
matklad:regression-backport
Apr 4, 2018
Merged

[beta] backport #5288#5291
bors merged 2 commits intorust-lang:rust-1.26.0from
matklad:regression-backport

Conversation

@matklad
Copy link
Contributor

@matklad matklad commented Apr 4, 2018

No description provided.

@matklad
Copy link
Contributor Author

matklad commented Apr 4, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Apr 4, 2018

📌 Commit 6421f08 has been approved by matklad

@bors
Copy link
Contributor

bors commented Apr 4, 2018

⌛ Testing commit 6421f08dc4d17618a1b01cb090555216506dbcd5 with merge 2405287a61448a11b43d26e16332a8055b4e9370...

@bors
Copy link
Contributor

bors commented Apr 4, 2018

💔 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
@matklad matklad force-pushed the regression-backport branch from 6421f08 to b9755c0 Compare April 4, 2018 06:35
@matklad
Copy link
Contributor Author

matklad commented Apr 4, 2018

@bors r+

CI failed because of different rustfmt versions. Pulling in the commit that disables rustfmt as well.

@bors
Copy link
Contributor

bors commented Apr 4, 2018

📌 Commit b9755c0 has been approved by matklad

@bors
Copy link
Contributor

bors commented Apr 4, 2018

⌛ Testing commit b9755c0 with merge 0dabed9...

bors added a commit that referenced this pull request Apr 4, 2018
@bors
Copy link
Contributor

bors commented Apr 4, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: matklad
Pushing 0dabed9 to rust-1.26.0...

@bors bors merged commit b9755c0 into rust-lang:rust-1.26.0 Apr 4, 2018
@matklad matklad deleted the regression-backport branch April 4, 2018 07:14
@ehuss ehuss added this to the 1.26.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants