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.

Sign up for GitHub

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

Jump to bottom

Automatically enable the clippy feature of rls if clippy builds #48097

Merged
merged 1 commit into from Mar 16, 2018
Merged

Automatically enable the clippy feature of rls if clippy builds #48097

merged 1 commit into from Mar 16, 2018

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Feb 9, 2018 •
edited

kennytm
kennytm reviewed Feb 9, 2018
View reviewed changes
src/bootstrap/lib.rs Outdated
#![feature(
associated_consts,
slice_concat_ext,
)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why expand this into 4 lines 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So future changes to the feature list are simpler

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We usually just write multiple #![feature] attributes though

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 9, 2018
@nrc
Copy link
Member

nrc commented Feb 12, 2018

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 12, 2018

📌 Commit 8a4ca24 has been approved by nrc

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 12, 2018
@kennytm kennytm mentioned this pull request Feb 14, 2018
Merged
@kennytm
Copy link
Member

kennytm commented Feb 14, 2018

@bors r-

Cannot find the commit 0d1fd8f7669587dbfc47aea565ef60a53e3bf4d9 for the RLS submodule. Perhaps this is due to rust-lang/rls#707 being closed. Please change the submodule to something in the remote repository.

[00:01:28] error: no such remote ref 0d1fd8f7669587dbfc47aea565ef60a53e3bf4d9
[00:01:28] Fetched in submodule path 'src/tools/rls', but it did not contain 0d1fd8f7669587dbfc47aea565ef60a53e3bf4d9. Direct fetching of that commit failed.

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 14, 2018
@bors
Copy link
Contributor

bors commented Feb 15, 2018

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

@oli-obk oli-obk force-pushed the did_you_mean_to_run_rls_with_clippy branch from 8a4ca24 to 99f774e Compare February 16, 2018 10:21
@oli-obk
Copy link
Contributor Author

oli-obk commented Feb 16, 2018

rebased and adjusted submodule references

@kennytm
Copy link
Member

kennytm commented Feb 16, 2018

@bors r=nrc

@bors
Copy link
Contributor

bors commented Feb 16, 2018

📌 Commit 99f774e has been approved by nrc

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 16, 2018
This was referenced Feb 19, 2018
Closed
Open
@bors
Copy link
Contributor

bors commented Feb 24, 2018

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

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 24, 2018
@shepmaster
Copy link
Member

Ping from triage, @oli-obk! It's been a few weeks since we've heard from you, will you have time to address the merge conflicts?

@oli-obk oli-obk force-pushed the did_you_mean_to_run_rls_with_clippy branch 2 times, most recently from 19557b0 to 6fa8d33 Compare March 6, 2018 14:41
@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 6, 2018

@bors r=nrc

@bors
Copy link
Contributor

bors commented Mar 6, 2018

📌 Commit 6fa8d33 has been approved by nrc

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 8, 2018

@bors r=nrc

@bors
Copy link
Contributor

bors commented Mar 8, 2018

📌 Commit 6f15e82 has been approved by nrc

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 8, 2018
@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 8, 2018

@bors r- you don't need to waste time on this now that the miri PR broke clippy

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 8, 2018
@bors
Copy link
Contributor

bors commented Mar 11, 2018

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

@oli-obk oli-obk force-pushed the did_you_mean_to_run_rls_with_clippy branch from 6f15e82 to 02ac15c Compare March 16, 2018 17:24
@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 16, 2018

Do not merge before rust-lang/rls#768 is merged

@mati865
Copy link
Contributor

mati865 commented Mar 16, 2018

rust-lang/rls#768 was merged

@oli-obk
Copy link
Contributor Author

oli-obk commented Mar 16, 2018

@bors r=nrc

@bors
Copy link
Contributor

bors commented Mar 16, 2018

📌 Commit 02ac15c has been approved by nrc

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 16, 2018
@bors
Copy link
Contributor

bors commented Mar 16, 2018

⌛ Testing commit 02ac15c with merge 55c984e...

bors added a commit that referenced this pull request Mar 16, 2018
@bors
Auto merge of #48097 - oli-obk:did_you_mean_to_run_rls_with_clippy, r…
55c984e 
…=nrc

Automatically enable the `clippy` feature of `rls` if clippy builds

r? @nrc

cc @Manishearth
@bors
Copy link
Contributor

bors commented Mar 16, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nrc
Pushing 55c984e to master...

@bors bors merged commit 02ac15c into rust-lang:master Mar 16, 2018
@kennytm-githubbot
Copy link

📣 Toolstate changed by #48097!

Tested on commit 55c984e.
Direct link to PR: #48097

🎉 clippy-driver on windows: build-fail → test-fail.
🎉 clippy-driver on linux: build-fail → test-fail.

kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 16, 2018
@kennytm-githubbot
📣 Toolstate changed by rust-lang/rust#48097!
f5d9993 
Tested on commit rust-lang/rust@55c984e.
Direct link to PR: <rust-lang/rust#48097>

🎉 clippy-driver on windows: build-fail → test-fail.
🎉 clippy-driver on linux: build-fail → test-fail.
This was referenced Mar 16, 2018
Merged
Merged
Merged
Merged
Merged
Merged
@kennytm kennytm mentioned this pull request May 15, 2018
Merged
@oli-obk oli-obk deleted the did_you_mean_to_run_rls_with_clippy branch May 15, 2018 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm left review comments

Assignees

@nrc nrc

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@oli-obk @nrc @bors @kennytm @shepmaster @alexcrichton @mati865 @kennytm-githubbot