Skip to content

/rust

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

Don't assume color=always when explicitally specified #31550

Merged
merged 1 commit into from Feb 12, 2016

Conversation

Reviewers
No reviews
Assignees

@nrc nrc

Labels
E-needstest T-compiler beta-accepted
Projects
None yet
Milestone
No milestone
9 participants
@Stebalien @rust-highfive @nrc @bors @alexcrichton @durka @pnkfelix @nikomatsakis @arielb1
@Stebalien
Copy link
Contributor

Stebalien commented Feb 11, 2016

Fixes #31546

@rust-highfive rust-highfive assigned alexcrichton Feb 11, 2016

@rust-highfive

This comment has been minimized.

Sign in to view
Copy link
Collaborator

rust-highfive commented Feb 11, 2016

r? @alexcrichton

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

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

Stebalien commented Feb 11, 2016

r? @nrc

@rust-highfive rust-highfive assigned nrc and unassigned alexcrichton Feb 11, 2016

@Stebalien

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

Stebalien commented Feb 11, 2016

Note: I haven't actually tested this change because rust takes an eternity to build on my poor old laptop. However, I don't expect it to fail (famous last words...).
src/librustc/session/config.rs Outdated

Some(arg) => {
early_error(ErrorOutputType::default(), &format!("argument for --error-format must \
early_error(ErrorOutputType::HumanReadable(color), &format!("argument for --error-format must \

This comment has been minimized.

Sign in to view
Copy link
@nrc

nrc Feb 11, 2016

Member

Overlong line

This comment has been minimized.

Sign in to view
Copy link
@Stebalien

Stebalien Feb 11, 2016

Author Contributor

Fixed.

@Stebalien Stebalien force-pushed the Stebalien:fix-color branch from 5b79f0d to 6b2ff77 Feb 11, 2016

src/librustc/session/config.rs Outdated
early_error(ErrorOutputType::HumanReadable(color),
&format!("argument for --error-format must \
be human or json (instead was \
`{}`)",

This comment has been minimized.

Sign in to view
Copy link
@nrc

nrc Feb 11, 2016

Member

nit: this can squeeze on the previous line.
@nrc

This comment has been minimized.

Sign in to view
Copy link
Member

nrc commented Feb 11, 2016

r+ with the style nit addressed

@Stebalien Stebalien force-pushed the Stebalien:fix-color branch from 6b2ff77 to eea3332 Feb 11, 2016

@Stebalien Stebalien force-pushed the Stebalien:fix-color branch from eea3332 to 03ef55b Feb 11, 2016

@nrc

This comment has been minimized.

Sign in to view
Copy link
Member

nrc commented Feb 11, 2016

@bors: r+
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 11, 2016

📌 Commit 03ef55b has been approved by nrc
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Feb 11, 2016

Thanks for the quick fix @Stebalien!

Nominating for backport as well

@alexcrichton alexcrichton added the beta-nominated label Feb 11, 2016

@durka

This comment has been minimized.

Sign in to view
Copy link
Contributor

durka commented Feb 11, 2016

Can we test this somehow to prevent future regressions? Maybe with a run-make test that greps for \x1b or something?
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 12, 2016

⌛️ Testing commit 03ef55b with merge 0c4d81f...

bors added a commit that referenced this pull request Feb 12, 2016

@bors
Auto merge of #31550 - Stebalien:fix-color, r=nrc 
Fixes #31546
0c4d81f
@pnkfelix

This comment has been minimized.

Sign in to view
Copy link
Member

pnkfelix commented Feb 12, 2016

@durka I agree, it seems like testing this via run-make would be good. Adding E-needstest flag...

Update: (or maybe I should have put the flag on #31546 ... either way, I suspect bors is going to close the PR and issue regardless of what labels I add at this point...)

@pnkfelix pnkfelix added the E-needstest label Feb 12, 2016

@bors

@bors bors merged commit 03ef55b into rust-lang:master Feb 12, 2016
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@bors bors referenced this pull request Feb 12, 2016

Merged

Make more use of autoderef throughout the compiler #31524

@nikomatsakis nikomatsakis added T-compiler beta-accepted labels Feb 24, 2016

@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor

nikomatsakis commented Feb 24, 2016

Accepting for beta since seems awfully minor.
@nikomatsakis

This comment has been minimized.

Sign in to view
Copy link
Contributor

nikomatsakis commented Feb 24, 2016

cc @rust-lang/compiler
@arielb1

This comment has been minimized.

Sign in to view
Copy link
Contributor

arielb1 commented Feb 25, 2016

+1

@brson brson referenced this pull request Feb 26, 2016

Merged

Beta next #31917

@alexcrichton alexcrichton removed the beta-nominated label Feb 26, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.