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

Add error code for unstable feature errors #47413

Merged
merged 1 commit into from
Jan 15, 2018
Merged

Add error code for unstable feature errors #47413

merged 1 commit into from
Jan 15, 2018

Conversation

GuillaumeGomez
Copy link
Member

Fixes #47397.

@rust-highfive
Copy link
Collaborator

r? @arielb1

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

@GuillaumeGomez GuillaumeGomez force-pushed the unstable-error-code branch 2 times, most recently from c8a7aea to f6d56ed Compare January 13, 2018 19:20
@GuillaumeGomez GuillaumeGomez added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 13, 2018
@bors
Copy link
Contributor

bors commented Jan 14, 2018

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

@estebank
Copy link
Contributor

r=me after rebasing against master.

@estebank estebank 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 14, 2018
@GuillaumeGomez
Copy link
Member Author

Rebased. Considering the fact that I updated a lot of UI tests, I'll put a small priority (but sill bigger than 0) to avoid too much rebases.

@bors: r=estebank p=1

@bors
Copy link
Contributor

bors commented Jan 14, 2018

📌 Commit 2c99ace has been approved by estebank

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 14, 2018
@GuillaumeGomez
Rollup merge of rust-lang#47413 - GuillaumeGomez:unstable-error-code,…
841cd47 
… r=estebank

Add error code for unstable feature errors

Fixes rust-lang#47397.
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jan 14, 2018
Closed
@bors
Copy link
Contributor

bors commented Jan 15, 2018

⌛ Testing commit 2c99ace with merge c4638d2cea1ae0788a770799e55bd5ca2bcbb254...

@bors bors mentioned this pull request Jan 15, 2018
Merged
@bors
Copy link
Contributor

bors commented Jan 15, 2018

💔 Test failed - status-travis

@estebank
Copy link
Contributor

@bors r-

There seem to be some issues with a test.

@GuillaumeGomez
Copy link
Member Author

Apparently there was an extra empty line in one stderr file. Strange... Should work now (but I'll wait for CI first).

@estebank
Copy link
Contributor

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Jan 15, 2018

📌 Commit c8a110e has been approved by estebank

@bors
Copy link
Contributor

bors commented Jan 15, 2018

⌛ Testing commit c8a110e with merge 79a521b...

bors added a commit that referenced this pull request Jan 15, 2018
@bors
Auto merge of #47413 - GuillaumeGomez:unstable-error-code, r=estebank
79a521b 
Add error code for unstable feature errors

Fixes #47397.
@bors
Copy link
Contributor

bors commented Jan 15, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: estebank
Pushing 79a521b to master...

@bors bors merged commit c8a110e into rust-lang:master Jan 15, 2018
@bors bors mentioned this pull request Jan 15, 2018
Merged
@GuillaumeGomez GuillaumeGomez deleted the unstable-error-code branch January 16, 2018 08:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@arielb1 arielb1

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@GuillaumeGomez @rust-highfive @bors @estebank @arielb1