Uh oh!
There was an error while loading. Please reload this page.
update crate dependencies - #42936
Conversation
rust-highfive
commented
Jun 27, 2017
(rust_highfive has picked a reviewer for you, use r? to override) |
Mark-Simulacrum
left a comment
There was a problem hiding this comment.
Will leave for @alexcrichton to sign off on but looks good in general to me.
est31
commented
Jun 27, 2017
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 |
alexcrichton
commented
Jun 27, 2017
@bors: r+ |
bors
commented
Jun 27, 2017
📌 Commit ec22738 has been approved by |
ishitatsuyuki
commented
Jun 28, 2017
I feel that Cargo.lock updates should have priority; otherwise it would easily conflict with other changes which have more risk to fail. |
Mark-Simulacrum
commented
Jun 28, 2017
Not sure what you mean. We try to avoid updates in non-dedicated pull requests to Cargo.lock, so conflicts should be rare. |
ishitatsuyuki
commented
Jun 28, 2017
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. |
Mark-Simulacrum
commented
Jun 28, 2017
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). |
est31
commented
Jun 28, 2017
A PR which this blocks would have to update Cargo.lock, which happens very rarely. |
frewsxcv
commented
Jun 29, 2017
@bors rollup |
bors
commented
Jul 1, 2017
☔ The latest upstream changes (presumably #42995) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
commented
Jul 2, 2017
🔒 Merge conflict |
aidanhs
commented
Jul 5, 2017
Hi @steveklabnik looks like this has some merge conflicts. |
steveklabnik
commented
Jul 5, 2017
Updated; looks like it's good to go now. |
alexcrichton
commented
Jul 6, 2017
@bors: r+ |
bors
commented
Jul 6, 2017
📌 Commit 4d14d75 has been approved by |
bors
commented
Jul 6, 2017
🔒 Merge conflict |
Maybe it's time to develop a custom merge driver (that clear and generates lockfile on every merge conflict). |
bors
commented
Jul 9, 2017
☔ The latest upstream changes (presumably #43115) made this pull request unmergeable. Please resolve the merge conflicts. |
arielb1
commented
Jul 11, 2017
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.
steveklabnik
commented
Jul 12, 2017
@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 |
bors
commented
Jul 12, 2017
📌 Commit 4871dba has been approved by |
steveklabnik
commented
Jul 12, 2017
@bors: rollup- |
bors
commented
Jul 12, 2017
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.
bors
commented
Jul 12, 2017
☀️ 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.