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

crate shorthand visibility modifier #45401

Merged

Conversation

zackmdavis
Copy link
Member

@zackmdavis zackmdavis commented Oct 20, 2017

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 20, 2017
@petrochenkov
Copy link
Contributor

Everything looks good to me.
@bors r+

P.S. I've edited the PR message so it doesn't close the tracking issue automatically.

@bors
Copy link
Contributor

bors commented Oct 22, 2017

📌 Commit 4926806 has been approved by petrochenkov

@kennytm kennytm 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 Oct 22, 2017
@bors
Copy link
Contributor

bors commented Oct 22, 2017

⌛ Testing commit 4926806413c17cd49ebffcbe365c55723834e45c with merge 4a20849909e2fab36af284637eb6466e3bf80290...

@bors
Copy link
Contributor

bors commented Oct 22, 2017

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented Oct 22, 2017

Cannot build rustfmt (and thus RLS), legit. The tools need to be broken.

[01:04:05] Dist RLS stage2 (x86_64-pc-windows-msvc)
[01:04:05] Building stage2 tool rls (x86_64-pc-windows-msvc)
...
[01:04:57] error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 2 fields
[01:04:57]   --> src\tools\rustfmt\src\utils.rs:40:9
[01:04:57]    |
[01:04:57] 40 |         Visibility::Crate(_) => Cow::from("pub(crate) "),
[01:04:57]    |         ^^^^^^^^^^^^^^^^^^^^ expected 2 fields, found 1
[01:04:57] 
[01:05:00] error: aborting due to previous error
[01:05:00] 
[01:05:02] error: Could not compile `rustfmt-nightly`.
[01:05:02] warning: build failed, waiting for other jobs to finish...
[01:05:04] error: build failed

@kennytm kennytm 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 Oct 22, 2017
@zackmdavis zackmdavis force-pushed the crate_shorthand_visibility_modifier branch from 4926806 to 55c773e Compare October 23, 2017 06:55
With regrets, this breaks rustfmt and rls.

This is in the matter of rust-lang#45388.
@zackmdavis zackmdavis force-pushed the crate_shorthand_visibility_modifier branch from 55c773e to 214b0f2 Compare October 23, 2017 06:58
@zackmdavis
Copy link
Member Author

zackmdavis commented Oct 23, 2017

force-push 214b0f2 removes the "Resolves" commit-message language concerning #45388 (I had been given to understand that the tracking issue would be #44660, but I agree that that's a bit unwieldy) and sets the toolstate for rustfmt and RLS to "Broken" (sorry @nrc)

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

@bors r+

@bors
Copy link
Contributor

bors commented Oct 23, 2017

📌 Commit 214b0f2 has been approved by nikomatsakis

@kennytm kennytm 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 Oct 24, 2017
@bors
Copy link
Contributor

bors commented Oct 24, 2017

⌛ Testing commit 214b0f2 with merge fbc3642...

bors added a commit that referenced this pull request Oct 24, 2017
…, r=nikomatsakis

`crate` shorthand visibility modifier

cc #45388.

r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Oct 24, 2017

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

@bors bors merged commit 214b0f2 into rust-lang:master Oct 24, 2017
@zackmdavis zackmdavis deleted the crate_shorthand_visibility_modifier branch January 13, 2018 07:40
yui-knk added a commit to yui-knk/rust that referenced this pull request Dec 2, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Dec 3, 2018
…ibility, r=petrochenkov

Add description about `crate` for parse_visibility's comment

This rule was introduced by rust-lang#45401.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: 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.

None yet

5 participants