Split ColorConfig off of HumanReadableErrorType
#128806
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
estebank
force-pushed
the
color-config
branch
2 times, most recently
from
3966c54
to
9ee3a14
Compare
This comment has been minimized.
This comment has been minimized.
|
r? jieyouxu |
jieyouxu
approved these changes
Aug 8, 2024
| config::ErrorOutputType::HumanReadable(kind) => { | ||
| let (short, color_config) = kind.unzip(); | ||
| config::ErrorOutputType::HumanReadable(kind, color_config) => { | ||
| let short = matches!(kind, HumanReadableErrorType::Short); |
There was a problem hiding this comment.
Nit: very tiny nit: this matches!(kind, HumanReadableErrorType::Short) is repeated in quite a few places. Since HumanReadableErrorType derives PartialEq, this could just be
kind == HumanReadableErrorType::Shortor maybe if we want the usage site to look like kind.short()
impl HumanReadableErrorType {
fn short(self) -> bool { self == HumanReadableErrorType::Short }
}
jieyouxu
added
S-waiting-on-author
The previous setup tied two unrelated things together. Splitting these two is a better model.
estebank
force-pushed
the
color-config
branch
2 times, most recently
from
1a0c155
to
4447880
Compare
This comment has been minimized.
This comment has been minimized.
|
@bors r=jieyouxu |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 8, 2024
Split `ColorConfig` off of `HumanReadableErrorType` The previous setup tied two unrelated things together. Splitting these two is a better model. Identified by https://github.com/rust-lang/rust/pull/126597/files#r1667800754
This was referenced Aug 8, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 9, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#128640 (rwlock: disable 'frob' test in Miri on macOS) - rust-lang#128791 (Don't implement `AsyncFn` for `FnDef`/`FnPtr` that wouldnt implement `Fn`) - rust-lang#128806 (Split `ColorConfig` off of `HumanReadableErrorType`) - rust-lang#128818 (std float tests: special-case Miri in feature detection) - rust-lang#128834 (rustdoc: strip unreachable modules) - rust-lang#128836 (rustdoc-json: add a test for impls on private & hidden types) - rust-lang#128837 (Clippy subtree update) - rust-lang#128851 (Add comment that bors did not see pushed before it merged) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 9, 2024
Rollup merge of rust-lang#128806 - estebank:color-config, r=jieyouxu Split `ColorConfig` off of `HumanReadableErrorType` The previous setup tied two unrelated things together. Splitting these two is a better model. Identified by https://github.com/rust-lang/rust/pull/126597/files#r1667800754
github-merge-queue bot
pushed a commit
to model-checking/kani
that referenced
this pull request
Aug 28, 2024
Upgrades toolchain to 08/28 Culprit upstream changes: 1. rust-lang/rust#128812 2. rust-lang/rust#128703 3. rust-lang/rust#127679 4. rust-lang/rust-clippy#12993 5. rust-lang/cargo#14370 6. rust-lang/rust#128806 Resolves #3429 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The previous setup tied two unrelated things together. Splitting these two is a better model.
Identified by https://github.com/rust-lang/rust/pull/126597/files#r1667800754