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

Set short-message feature unstable #46005

Merged
merged 1 commit into from
Nov 16, 2017
Merged

Set short-message feature unstable #46005

merged 1 commit into from
Nov 16, 2017

Conversation

GuillaumeGomez
Copy link
Member

Fixes #45995.

r? @nrc

QuietMisdreavus
QuietMisdreavus reviewed Nov 15, 2017
View reviewed changes
src/librustc/session/config.rs Outdated
} else {
early_error(error_format,
&format!("the `-Z unstable-options` flag must also be passed to \
enable the target-spec-json print option"));
Copy link
Member

Choose a reason for hiding this comment

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

is "target-spec-json" the right thing to say here?

Copy link
Member Author

Choose a reason for hiding this comment

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

No. Good catch, thanks!

@QuietMisdreavus
Copy link
Member

also:

[00:04:37] tidy error: /checkout/src/librustc/session/config.rs:1482: tab character
[00:04:37] tidy error: /checkout/src/librustc/session/config.rs:1482: trailing whitespace
[00:04:39] some tidy checks failed

@QuietMisdreavus
Copy link
Member 

[00:06:38] error[E0425]: cannot find value `error_format` in this scope
[00:06:38]     --> /checkout/src/librustc/session/config.rs:1478:33
[00:06:38]      |
[00:06:38] 1478 |                     early_error(error_format,
[00:06:38]      |                                 ^^^^^^^^^^^^ not found in this scope
[00:06:38] 
[00:06:57] error: aborting due to previous error
[00:06:57] 
[00:06:57] error: Could not compile `rustc`.

@GuillaumeGomez
Copy link
Member Author

So inconvenient to not be able to compile the code haha.

@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 15, 2017
@kennytm
Copy link
Member

kennytm commented Nov 15, 2017

Please update src/test/ui/short-error-format.rs to include the -Z unstable-options flag.

@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 Nov 15, 2017
@nrc
Copy link
Member

nrc commented Nov 16, 2017

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 16, 2017

📋 Looks like this PR is still in progress, ignoring approval

@nrc nrc 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 Nov 16, 2017
@kennytm
Copy link
Member

kennytm commented Nov 16, 2017

@GuillaumeGomez is this PR ready to be merged? If yes, please remove the “WIP” from the title.

@GuillaumeGomez GuillaumeGomez changed the title [WIP] Set short-message feature unstable Set short-message feature unstable Nov 16, 2017
@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented Nov 16, 2017 •
edited
Loading

Yes it is, sorry about that.

@bors: r=nrc

@bors
Copy link
Contributor

bors commented Nov 16, 2017

📌 Commit 9338b49 has been approved by kennytm

@bors
Copy link
Contributor

bors commented Nov 16, 2017

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Nov 16, 2017

📌 Commit 9338b49 has been approved by kennytm

@bors
Copy link
Contributor

bors commented Nov 16, 2017

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Nov 16, 2017

📌 Commit 9338b49 has been approved by nrc

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 16, 2017
@GuillaumeGomez
Rollup merge of rust-lang#46005 - GuillaumeGomez:short-unstable, r=nrc
b09af70 
Set short-message feature unstable

Fixes rust-lang#45995.

r? @nrc
@GuillaumeGomez GuillaumeGomez mentioned this pull request Nov 16, 2017
Merged
@GuillaumeGomez
Copy link
Member Author

@bors: p=1000

@kennytm
Copy link
Member

kennytm commented Nov 16, 2017 •
edited
Loading

@GuillaumeGomez Since this is included in the rollup #46029, should that be closed or what

Edit: I'll just give the rollup a higher priority.

@bors p=1

bors added a commit that referenced this pull request Nov 16, 2017
@bors
Auto merge of #46029 - GuillaumeGomez:rollup, r=GuillaumeGomez
58d8761 
Rollup of 6 pull requests

- Successful merges: #45951, #45973, #45984, #45993, #46005, #46010
- Failed merges:
@bors
Copy link
Contributor

bors commented Nov 16, 2017

⌛ Testing commit 9338b49 with merge 58d8761...

@bors bors merged commit 9338b49 into rust-lang:master Nov 16, 2017
@QuietMisdreavus QuietMisdreavus mentioned this pull request Nov 16, 2017
Closed
@GuillaumeGomez GuillaumeGomez deleted the short-unstable branch November 17, 2017 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QuietMisdreavus QuietMisdreavus QuietMisdreavus 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.
5 participants
@GuillaumeGomez @QuietMisdreavus @kennytm @nrc @bors