diff options
| author | bors <bors@rust-lang.org> | 2023-02-01 01:15:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-01 01:15:02 +0000 |
| commit | ad8e1dc2863f63c35ef3ceef3064d0851a1d2582 (patch) | |
| tree | 64d8db18dc8c8e118fd859c74061a34efbcae9d4 /compiler/rustc_errors/src/styled_buffer.rs | |
| parent | 5b6ed253c42a69b93e7447fb0874a89ab6bc1cfb (diff) | |
| parent | adc3f8a44b943463577a5f8870da8fd18b749351 (diff) | |
| download | rust-ad8e1dc2863f63c35ef3ceef3064d0851a1d2582.tar.gz rust-ad8e1dc2863f63c35ef3ceef3064d0851a1d2582.zip | |
Auto merge of #107536 - GuillaumeGomez:rollup-xv7dx2h, r=GuillaumeGomez
Rollup of 12 pull requests Successful merges: - #106898 (Include both md and yaml ICE ticket templates) - #107331 (Clean up eslint annotations and remove unused JS function) - #107348 (small refactor to new projection code) - #107354 (rustdoc: update Source Serif 4 from 4.004 to 4.005) - #107412 (avoid needless checks) - #107467 (Improve enum checks) - #107486 (Track bound types like bound regions) - #107491 (rustdoc: remove unused CSS from `.setting-check`) - #107508 (`Edition` micro refactor) - #107525 (PointeeInfo is advisory only) - #107527 (rustdoc: stop making unstable items transparent) - #107535 (Replace unwrap with ? in TcpListener doc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_errors/src/styled_buffer.rs')
| -rw-r--r-- | compiler/rustc_errors/src/styled_buffer.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_errors/src/styled_buffer.rs b/compiler/rustc_errors/src/styled_buffer.rs index 9abdb5fc97c..9aa14e1f214 100644 --- a/compiler/rustc_errors/src/styled_buffer.rs +++ b/compiler/rustc_errors/src/styled_buffer.rs @@ -142,7 +142,7 @@ impl StyledBuffer { pub fn set_style(&mut self, line: usize, col: usize, style: Style, overwrite: bool) { if let Some(ref mut line) = self.lines.get_mut(line) { if let Some(StyledChar { style: s, .. }) = line.get_mut(col) { - if overwrite || *s == Style::NoStyle || *s == Style::Quotation { + if overwrite || matches!(s, Style::NoStyle | Style::Quotation) { *s = style; } } |
