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

Corrected the CONTRIBUTING.md "External Dependencies" section #44664

Merged
merged 1 commit into from Oct 5, 2017

Conversation

Projects
None yet
6 participants
@budziq
Contributor

budziq commented Sep 17, 2017

The "External Dependencies" section is a little outdated.
Please see following comments #44567 (comment) #44567 (comment) for rationale.

@carols10cents

This comment has been minimized.

Show comment
Hide comment
@carols10cents
Member

carols10cents commented Sep 18, 2017

r? @steveklabnik

@alexcrichton

This comment has been minimized.

Show comment
Hide comment
@alexcrichton

alexcrichton Sep 18, 2017

Member

I think this may conflict with #44679, which is also changing this file

Member

alexcrichton commented Sep 18, 2017

I think this may conflict with #44679, which is also changing this file

@oli-obk

This comment has been minimized.

Show comment
Hide comment
@oli-obk

oli-obk Sep 19, 2017

Contributor

Fine by me, if clippy isn't replaced, but instead rustfmt is added to the list.

It might be easier for now to suggest opening a PR and marking the tool as broken as the primary way to solve this, since in curtains no waiting time ( with the solution in this PR you need to wait on the tool Devs)

Contributor

oli-obk commented Sep 19, 2017

Fine by me, if clippy isn't replaced, but instead rustfmt is added to the list.

It might be easier for now to suggest opening a PR and marking the tool as broken as the primary way to solve this, since in curtains no waiting time ( with the solution in this PR you need to wait on the tool Devs)

@budziq

This comment has been minimized.

Show comment
Hide comment
@budziq

budziq Sep 19, 2017

Contributor

It might be easier for now to suggest opening a PR and marking the tool as broken as the primary way to solve this,

As long as this approach is the one actually agreed upon by the maintainers I'm game!
Should I close this PR?

Contributor

budziq commented Sep 19, 2017

It might be easier for now to suggest opening a PR and marking the tool as broken as the primary way to solve this,

As long as this approach is the one actually agreed upon by the maintainers I'm game!
Should I close this PR?

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Sep 21, 2017

Contributor

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

Contributor

bors commented Sep 21, 2017

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

@carols10cents

This comment has been minimized.

Show comment
Hide comment
@carols10cents

carols10cents Sep 25, 2017

Member

@budziq it sounds like @oli-obk was suggesting some modifications to this PR, not necessarily closing it-- do I have that right? It also looks like there were indeed some merge conflicts introduced by #44679 that you'll need to resolve :)

Member

carols10cents commented Sep 25, 2017

@budziq it sounds like @oli-obk was suggesting some modifications to this PR, not necessarily closing it-- do I have that right? It also looks like there were indeed some merge conflicts introduced by #44679 that you'll need to resolve :)

@budziq

This comment has been minimized.

Show comment
Hide comment
@budziq

budziq Sep 25, 2017

Contributor

Thanks @carols10cents!
I've updated the PR with best I could infer, but honestly I'm still unclear about the expected workflow in case of broken submodules.

Contributor

budziq commented Sep 25, 2017

Thanks @carols10cents!
I've updated the PR with best I could infer, but honestly I'm still unclear about the expected workflow in case of broken submodules.

@oli-obk

This comment has been minimized.

Show comment
Hide comment
@oli-obk

oli-obk Sep 26, 2017

Contributor

Since pull requests are rather volatile, we are supposed to only point to branches, not to pull requests. This means that if the tool authors accept your pull request into a branch, you may point your PR's submodule to the tool-branch, but you may not point it to the tool-PR

Contributor

oli-obk commented Sep 26, 2017

Since pull requests are rather volatile, we are supposed to only point to branches, not to pull requests. This means that if the tool authors accept your pull request into a branch, you may point your PR's submodule to the tool-branch, but you may not point it to the tool-PR

@budziq

This comment has been minimized.

Show comment
Hide comment
@budziq

budziq Sep 30, 2017

Contributor

Sorry, I've been super busy with rust-fest preparations. I'll push an update within next 2 days!

Contributor

budziq commented Sep 30, 2017

Sorry, I've been super busy with rust-fest preparations. I'll push an update within next 2 days!

@budziq

This comment has been minimized.

Show comment
Hide comment
@budziq

budziq Sep 30, 2017

Contributor

@oli-obk Updated!

Contributor

budziq commented Sep 30, 2017

@oli-obk Updated!

Show outdated Hide outdated CONTRIBUTING.md Outdated
@budziq

This comment has been minimized.

Show comment
Hide comment
@budziq

budziq Oct 1, 2017

Contributor

Sry hope it's ok now

Contributor

budziq commented Oct 1, 2017

Sry hope it's ok now

@steveklabnik

This comment has been minimized.

Show comment
Hide comment
@steveklabnik

steveklabnik Oct 5, 2017

Member

@bors: r+ rollup

thanks!

Member

steveklabnik commented Oct 5, 2017

@bors: r+ rollup

thanks!

@bors

This comment has been minimized.

Show comment
Hide comment
@bors

bors Oct 5, 2017

Contributor

📌 Commit e6c3c7f has been approved by steveklabnik

Contributor

bors commented Oct 5, 2017

📌 Commit e6c3c7f has been approved by steveklabnik

kennytm added a commit to kennytm/rust that referenced this pull request Oct 5, 2017

Rollup merge of rust-lang#44664 - budziq:contributing_external, r=ste…
…veklabnik

Corrected the CONTRIBUTING.md "External Dependencies" section

The "External Dependencies" section is a little outdated.
Please see following comments rust-lang#44567 (comment) rust-lang#44567 (comment) for rationale.

@kennytm kennytm referenced this pull request Oct 5, 2017

Merged

Rollup of 9 pull requests #45046

bors added a commit that referenced this pull request Oct 5, 2017

Auto merge of #45046 - kennytm:rollup, r=kennytm
Rollup of 9 pull requests

- Successful merges: #44664, #44935, #44972, #44980, #44987, #44997, #45006, #45017, #45024
- Failed merges:

@bors bors merged commit e6c3c7f into rust-lang:master Oct 5, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment