Skip to content

Set short-message feature unstable - #46005

Merged
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:short-unstable
Nov 16, 2017
Merged

Set short-message feature unstable#46005
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:short-unstable

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Nov 15, 2017

Copy link
Copy Markdown
Member

Fixes#45995.

r? @nrc

QuietMisdreavus
QuietMisdreavus reviewed Nov 15, 2017
View reviewed changes
Comment threadsrc/librustc/session/config.rs Outdated

@QuietMisdreavusQuietMisdreavusNov 15, 2017

Copy link
Copy Markdown
Contributor

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?

@GuillaumeGomezGuillaumeGomezNov 15, 2017

Copy link
Copy Markdown
MemberAuthor

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

QuietMisdreavus commented Nov 15, 2017

Copy link
Copy Markdown
Contributor

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

QuietMisdreavus commented Nov 15, 2017

Copy link
Copy Markdown
Contributor
[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

GuillaumeGomez commented Nov 15, 2017

Copy link
Copy Markdown
MemberAuthor

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

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

kennytm commented Nov 15, 2017

Copy link
Copy Markdown
Member

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

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

nrc commented Nov 16, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Nov 16, 2017

Copy link
Copy Markdown
Collaborator

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

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

kennytm commented Nov 16, 2017

Copy link
Copy Markdown
Member

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

@GuillaumeGomezGuillaumeGomez changed the title [WIP] Set short-message feature unstableSet short-message feature unstableNov 16, 2017
@GuillaumeGomez

GuillaumeGomez commented Nov 16, 2017•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Yes it is, sorry about that.

@bors: r=nrc

@bors

bors commented Nov 16, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 9338b49 has been approved by kennytm

@bors

bors commented Nov 16, 2017

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Nov 16, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 9338b49 has been approved by kennytm

@bors

bors commented Nov 16, 2017

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Nov 16, 2017

Copy link
Copy Markdown
Collaborator

📌 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 ofrust-lang#46005- GuillaumeGomez:short-unstable, r=nrc
b09af70
Set short-message feature unstable
Fixesrust-lang#45995.
r? @nrc
@GuillaumeGomezGuillaumeGomez mentioned this pull request Nov 16, 2017
Merged
@GuillaumeGomez

GuillaumeGomez commented Nov 16, 2017

Copy link
Copy Markdown
MemberAuthor

@bors: p=1000

@kennytm

kennytm commented Nov 16, 2017•
edited
Loading

Copy link
Copy Markdown
Member

@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

bors commented Nov 16, 2017

Copy link
Copy Markdown
Collaborator

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

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

Reviewers

1 more reviewer
@QuietMisdreavusQuietMisdreavusQuietMisdreavus left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@nrcnrc

Labels

S-waiting-on-borsStatus: 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