Skip to content

Fix diagnostic colors on Windows 10 console. - #49399

Merged
bors merged 1 commit into
rust-lang:masterfrom
ehuss:termcolor-update
Mar 28, 2018
Merged

Fix diagnostic colors on Windows 10 console.#49399
bors merged 1 commit into
rust-lang:masterfrom
ehuss:termcolor-update

Conversation

@ehuss

@ehussehuss commented Mar 26, 2018

Copy link
Copy Markdown
Contributor

This updates termcolor to pick up BurntSushi/ripgrep#867.

Fixes#49322.

@bors

bors commented Mar 27, 2018

Copy link
Copy Markdown
Collaborator

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

@borsbors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 27, 2018
@alexcrichton

alexcrichton commented Mar 27, 2018

Copy link
Copy Markdown
Member

@bors: r+ rollup

Thanks!

@bors

bors commented Mar 27, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 0f1c649 has been approved by alexcrichton

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 27, 2018
@alexcrichton

alexcrichton commented Mar 27, 2018

Copy link
Copy Markdown
Member

@bors: p=1

(fixing a regression)

kennytm added a commit to kennytm/rust that referenced this pull request Mar 27, 2018
@kennytm
Rollup merge ofrust-lang#49399- ehuss:termcolor-update, r=alexcrichton
2d05bde
Fix diagnostic colors on Windows 10 console.
This updates termcolor to pick up BurntSushi/ripgrep#867.
Fixesrust-lang#49322.
@kennytmkennytm mentioned this pull request Mar 27, 2018
Merged
bors added a commit that referenced this pull request Mar 27, 2018
@bors
Auto merge of#49406- kennytm:rollup, r=kennytm
35f368f
Rollup of 11 pull requests
- Successful merges: #48639, #49223, #49333, #49369, #49381, #49395, #49399, #49401, #49417, #49202, #49426
- Failed merges:
bors added a commit that referenced this pull request Mar 28, 2018
@bors
Auto merge of#49406- kennytm:rollup, r=kennytm
59ec9bf
Rollup of 11 pull requests
- Successful merges: #48639, #49223, #49333, #49369, #49381, #49395, #49399, #49401, #49417, #49202, #49426
- Failed merges:
@bors
bors merged commit 0f1c649 into rust-lang:masterMar 28, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

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.

3 participants

@ehuss@bors@alexcrichton