-
Notifications
You must be signed in to change notification settings - Fork 12.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
update crate dependencies #42936
update crate dependencies #42936
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
7372799
to
ec22738
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will leave for @alexcrichton to sign off on but looks good in general to me.
I personally don't have any problems with updating all dependencies (this should be done from time to time either way IMO), but if you want to update only one crate, cd'ing into the src directory and then doing |
@bors: r+ |
📌 Commit ec22738 has been approved by |
I feel that Cargo.lock updates should have priority; otherwise it would easily conflict with other changes which have more risk to fail. |
Not sure what you mean. We try to avoid updates in non-dedicated pull requests to Cargo.lock, so conflicts should be rare. |
I mean, this will virtually block another approved PR from being merged as it would conflict as soon as this is merged. To minimize the cycle time, this PR should be prioritized. |
I wouldn't expect there to be conflicts unless the other PR also updated Cargo.lock; unless I'm missing something, that's rare -- and not all that harmful. Also, if we wait till the queue is mostly empty, this PR will have less of an effect then (so again, prioritizing it seems odd). |
A PR which this blocks would have to update Cargo.lock, which happens very rarely. |
@bors rollup |
☔ The latest upstream changes (presumably #42995) made this pull request unmergeable. Please resolve the merge conflicts. |
🔒 Merge conflict |
Hi @steveklabnik looks like this has some merge conflicts. |
ec22738
to
4d14d75
Compare
Updated; looks like it's good to go now. |
@bors: r+ |
📌 Commit 4d14d75 has been approved by |
🔒 Merge conflict |
Maybe it's time to develop a custom merge driver (that clear and generates lockfile on every merge conflict). |
☔ The latest upstream changes (presumably #43115) made this pull request unmergeable. Please resolve the merge conflicts. |
Hey @steveklabnik - looks like this just needs a rebase. Friendly ping to make sure it isn't getting lost. |
I wanted to update mdbook's version. This ended up updating a bunch of other stuff too.
4d14d75
to
4871dba
Compare
@bors: r=alexcrichton p=1 giving this a priority because i'm sick of rebasing it and want to make sure it lands before next week |
📌 Commit 4871dba has been approved by |
@bors: rollup- |
update crate dependencies I wanted to update mdbook's version. This ended up updating a bunch of other stuff too. I am not sure if updating this much stuff is considered a Good Idea or not; happy to figure out how to make it smaller if someone can help me figure out how to use x.py to do it.
☀️ Test successful - status-appveyor, status-travis |
I wanted to update mdbook's version. This ended up updating a bunch of other stuff too.
I am not sure if updating this much stuff is considered a Good Idea or not; happy to figure out how to make it smaller if someone can help me figure out how to use x.py to do it.