Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 9 pull requests #118767

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

Closed
wants to merge 28 commits into from
Closed

Rollup of 9 pull requests #118767

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5d16c54
Extend tidy alphabetical checking to `tests/`.
nnethercote Dec 8, 2023
a002814
Strengthen well known check-cfg names and values test
Urgau Dec 7, 2023
5a17ee7
Avoid target_os and target_arch in some check-cfg tests
Urgau Dec 7, 2023
d2d742c
coverage: Add a dedicated test for coverage of `if !`
Zalathar Nov 23, 2023
44b47aa
coverage: Add `CoverageKind::SpanMarker` for including extra spans in…
Zalathar Nov 23, 2023
9816635
coverage: Use `SpanMarker` to mark `continue` expressions.
Zalathar Nov 23, 2023
d90fd02
coverage: Use `SpanMarker` to mark the full condition of `if !`
Zalathar Nov 23, 2023
e0cd805
coverage: Simplify the heuristic for ignoring `async fn` return spans
Zalathar Dec 6, 2023
cec8142
coverage: Add `#[track_caller]` to the span generator's unwrap methods
Zalathar Dec 6, 2023
e01338a
coverage: Regression test for unwrapping `prev` when there are no spans
Zalathar Dec 8, 2023
b378059
update target feature following LLVM API change
krasimirgg Dec 4, 2023
9f0c6f1
Simplify and comment the special-casing for Windows colors
jyn514 Dec 8, 2023
96b027f
use magenta instead of bold for highlighting
jyn514 Dec 8, 2023
287c77e
Add tests related to normalization in implied bounds
spastorino Dec 1, 2023
8361a72
Introduce closure_id method on CoroutineKind
compiler-errors Dec 8, 2023
d5dcd85
More nits
compiler-errors Dec 8, 2023
384a49e
Rename some more coro_kind -> coroutine_kind
compiler-errors Dec 8, 2023
e987812
Make async generators fused by default
compiler-errors Dec 8, 2023
7079adb
Add Bevy related test cases
spastorino Dec 8, 2023
9566aab
Rollup merge of #118198 - Zalathar:if-not, r=cjgillot
workingjubilee Dec 9, 2023
5363200
Rollup merge of #118512 - spastorino:add-implied-bounds-related-tests…
workingjubilee Dec 9, 2023
4d94018
Rollup merge of #118610 - krasimirgg:llvm-18-dec, r=nikic
workingjubilee Dec 9, 2023
996f215
Rollup merge of #118666 - Zalathar:body-closure, r=cjgillot
workingjubilee Dec 9, 2023
8fb232d
Rollup merge of #118702 - Urgau:check-cfg-strengthen-well-known, r=nn…
workingjubilee Dec 9, 2023
8f1ac6e
Rollup merge of #118737 - nnethercote:tidy-alphabetical-in-testsa, r=…
workingjubilee Dec 9, 2023
a6e4fdb
Rollup merge of #118756 - jyn514:colors, r=estebank
workingjubilee Dec 9, 2023
2219bbf
Rollup merge of #118762 - compiler-errors:gen-nits, r=eholk
workingjubilee Dec 9, 2023
6418f0a
Rollup merge of #118764 - compiler-errors:fused-async-iterator, r=eholk
workingjubilee Dec 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify and comment the special-casing for Windows colors
  • Loading branch information
@jyn514
jyn514 committed Dec 8, 2023
commit 9f0c6f15ce32661e65034898155fcdaa8539201e
20 changes: 10 additions & 10 deletions compiler/rustc_errors/src/emitter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2674,6 +2674,14 @@ fn from_stderr(color: ColorConfig) -> Destination {
}
}

/// On Windows, BRIGHT_BLUE is hard to read on black. Use cyan instead.
///
/// See #36178.
#[cfg(windows)]
const BRIGHT_BLUE: Color = Color::Cyan;
#[cfg(not(windows))]
const BRIGHT_BLUE: Color = Color::Blue;

impl Style {
fn color_spec(&self, lvl: Level) -> ColorSpec {
let mut spec = ColorSpec::new();
Expand All @@ -2688,11 +2696,7 @@ impl Style {
Style::LineNumber => {
spec.set_bold(true);
spec.set_intense(true);
if cfg!(windows) {
spec.set_fg(Some(Color::Cyan));
} else {
spec.set_fg(Some(Color::Blue));
}
spec.set_fg(Some(BRIGHT_BLUE));
}
Style::Quotation => {}
Style::MainHeaderMsg => {
Expand All @@ -2707,11 +2711,7 @@ impl Style {
}
Style::UnderlineSecondary | Style::LabelSecondary => {
spec.set_bold(true).set_intense(true);
if cfg!(windows) {
spec.set_fg(Some(Color::Cyan));
} else {
spec.set_fg(Some(Color::Blue));
}
spec.set_fg(Some(BRIGHT_BLUE));
}
Style::HeaderMsg | Style::NoStyle => {}
Style::Level(lvl) => {
Expand Down