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

pub(restricted) didn't make it into 1.17 #41146

Merged
merged 1 commit into from
Apr 8, 2017
Merged

Conversation

est31
Copy link
Member

@est31 est31 commented Apr 7, 2017

Gets shipped in 1.18 instead.

@rust-highfive
Copy link
Collaborator

r? @nrc

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

@est31
Copy link
Member Author

est31 commented Apr 7, 2017

See also #40556 (comment)

// The #![windows_subsystem] attribute
(accepted, windows_subsystem, "1.18.0", Some(37499)),

>>>>>>> pub(restricted) didn't make it into 1.17
Copy link

Choose a reason for hiding this comment

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

I don't think above 2 lines should be a part of this patch.

Gets shipped in 1.18 instead.
@nrc
Copy link
Member

nrc commented Apr 7, 2017

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Apr 7, 2017

📌 Commit bfc08c1 has been approved by nrc

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 7, 2017
pub(restricted) didn't make it into 1.17

Gets shipped in 1.18 instead.
bors added a commit that referenced this pull request Apr 8, 2017
Rollup of 3 pull requests

- Successful merges: #41135, #41143, #41146
- Failed merges:
@bors
Copy link
Contributor

bors commented Apr 8, 2017

⌛ Testing commit bfc08c1 with merge 9c5c815...

@bors
Copy link
Contributor

bors commented Apr 8, 2017

💔 Test failed - status-appveyor

@TimNN
Copy link
Contributor

TimNN commented Apr 8, 2017

@bors
Copy link
Contributor

bors commented Apr 8, 2017

⌛ Testing commit bfc08c1 with merge 8fe0218...

TimNN added a commit to TimNN/rust that referenced this pull request Apr 8, 2017
pub(restricted) didn't make it into 1.17

Gets shipped in 1.18 instead.
@TimNN TimNN mentioned this pull request Apr 8, 2017
@TimNN
Copy link
Contributor

TimNN commented Apr 8, 2017

@bors retry

bors added a commit that referenced this pull request Apr 8, 2017
Rollup of 4 pull requests

- Successful merges: #41135, #41143, #41146, #41152
- Failed merges:
@bors bors merged commit bfc08c1 into rust-lang:master Apr 8, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants