Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
oli-obk:did_you_mean_to_run_rls_with_clippy
Mar 16, 2018
Merged

Automatically enable the clippy feature of rls if clippy builds#48097
bors merged 1 commit into
rust-lang:masterfrom
oli-obk:did_you_mean_to_run_rls_with_clippy

Conversation

@oli-obk

@oli-obkoli-obk commented Feb 9, 2018

Copy link
Copy Markdown
Contributor

Comment threadsrc/bootstrap/lib.rs Outdated

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

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
Copy Markdown
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

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

nrc commented Feb 12, 2018

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Feb 12, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 8a4ca24 has been approved by nrc

@borsbors 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
@kennytmkennytm mentioned this pull request Feb 14, 2018
@kennytm

Copy link
Copy Markdown
Member

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

@borsbors 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

bors commented Feb 15, 2018

Copy link
Copy Markdown
Collaborator

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

@oli-obk
oli-obkforce-pushed the did_you_mean_to_run_rls_with_clippy branch from 8a4ca24 to 99f774eCompareFebruary 16, 2018 10:21
@oli-obk

Copy link
Copy Markdown
ContributorAuthor

rebased and adjusted submodule references

@kennytm

Copy link
Copy Markdown
Member

@bors r=nrc

@bors

bors commented Feb 16, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 99f774e has been approved by nrc

@borsbors 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
@bors

bors commented Feb 24, 2018

Copy link
Copy Markdown
Collaborator

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

@borsbors 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
Copy Markdown
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-obkforce-pushed the did_you_mean_to_run_rls_with_clippy branch 2 times, most recently from 19557b0 to 6fa8d33CompareMarch 6, 2018 14:41
@oli-obk

Copy link
Copy Markdown
ContributorAuthor

@bors r=nrc

@bors

bors commented Mar 6, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 6fa8d33 has been approved by nrc

@bors

bors commented Mar 8, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 6f15e82 has been approved by nrc

@borsbors 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
Copy Markdown
ContributorAuthor

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

@borsbors 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

bors commented Mar 11, 2018

Copy link
Copy Markdown
Collaborator

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

@oli-obk
oli-obkforce-pushed the did_you_mean_to_run_rls_with_clippy branch from 6f15e82 to 02ac15cCompareMarch 16, 2018 17:24
@oli-obk

Copy link
Copy Markdown
ContributorAuthor

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

@mati865

Copy link
Copy Markdown
Member

rust-lang/rls#768 was merged

@oli-obk

Copy link
Copy Markdown
ContributorAuthor

@bors r=nrc

@bors

bors commented Mar 16, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 02ac15c has been approved by nrc

@borsbors 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

bors commented Mar 16, 2018

Copy link
Copy Markdown
Collaborator

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

bors added a commit that referenced this pull request Mar 16, 2018
…=nrc
Automatically enable the `clippy` feature of `rls` if clippy builds
r? @nrc
cc @Manishearth
@bors

bors commented Mar 16, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 02ac15c into rust-lang:masterMar 16, 2018
@kennytm-githubbot

Copy link
Copy Markdown

📣 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
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.
@oli-obk
oli-obk deleted the did_you_mean_to_run_rls_with_clippy branch May 15, 2018 09:48
bors pushed a commit to rust-lang-ci/rust that referenced this pull request Jan 2, 2025
This field was introduced in rust-lang#48097 to support the "clippy" feature of RLS.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@oli-obk@nrc@bors@kennytm@shepmaster@alexcrichton@mati865@kennytm-githubbot