Skip to content
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

Merged
merged 1 commit into from
Jul 12, 2017
Merged

update crate dependencies #42936

merged 1 commit into from
Jul 12, 2017

Conversation

steveklabnik
Copy link
Member

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.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a 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.

@est31
Copy link
Member

est31 commented Jun 27, 2017

if someone can help me figure out how to use x.py to do it.

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 cargo update -p mdbook should do it

@arielb1 arielb1 added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 27, 2017
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jun 27, 2017

📌 Commit ec22738 has been approved by alexcrichton

@ishitatsuyuki
Copy link
Contributor

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
Copy link
Member

Not sure what you mean. We try to avoid updates in non-dedicated pull requests to Cargo.lock, so conflicts should be rare.

@ishitatsuyuki
Copy link
Contributor

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
Copy link
Member

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
Copy link
Member

est31 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.

A PR which this blocks would have to update Cargo.lock, which happens very rarely.

@frewsxcv
Copy link
Member

@bors rollup

This was referenced Jun 30, 2017
bors added a commit that referenced this pull request Jun 30, 2017
Rollup of 6 pull requests

- Successful merges: #42669, #42911, #42925, #42957, #42985, #42987
- Failed merges: #42936
@bors
Copy link
Contributor

bors commented Jul 1, 2017

☔ The latest upstream changes (presumably #42995) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Contributor

bors commented Jul 2, 2017

🔒 Merge conflict

@aidanhs aidanhs added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 5, 2017
@aidanhs
Copy link
Member

aidanhs commented Jul 5, 2017

Hi @steveklabnik looks like this has some merge conflicts.

@steveklabnik
Copy link
Member Author

Updated; looks like it's good to go now.

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 6, 2017

📌 Commit 4d14d75 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jul 6, 2017

🔒 Merge conflict

@ishitatsuyuki
Copy link
Contributor

ishitatsuyuki commented Jul 7, 2017

Maybe it's time to develop a custom merge driver (that clear and generates lockfile on every merge conflict).

@bors
Copy link
Contributor

bors commented Jul 9, 2017

☔ The latest upstream changes (presumably #43115) made this pull request unmergeable. Please resolve the merge conflicts.

@arielb1
Copy link
Contributor

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
Copy link
Member Author

#42936 (comment)

@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
Copy link
Contributor

bors commented Jul 12, 2017

📌 Commit 4871dba has been approved by alexcrichton

@steveklabnik
Copy link
Member Author

@bors: rollup-

@bors
Copy link
Contributor

bors commented Jul 12, 2017

⌛ Testing commit 4871dba with merge d1f1f86...

bors added a commit that referenced this pull request 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
Copy link
Contributor

bors commented Jul 12, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing d1f1f86 to master...

@bors bors merged commit 4871dba into rust-lang:master Jul 12, 2017
@bors bors mentioned this pull request Jul 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants