user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify style_or_override

Browse source
This commit is contained in:
AnthonyMikh 2019-09-26 00:42:55 +03:00 • committed by GitHub
parent ea32862503
commit 7a0725fdaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_errors/emitter.rs
View file

@ -1066,13 +1066,11 @@ impl EmitterWriter {
let padding = " ".repeat(padding + label.len() + 5);
/// Returns `true` if `style`, or the override if present and the style is `NoStyle`.
fn style_or_override(style: Style, override_style: Option<Style>) -> Style {
if let Some(o) = override_style {
if style == Style::NoStyle {
return o;
}
fn style_or_override(style: Style, override: Option<Style>) -> Style {
match (style, override) {
(Style::NoStyle, Some(override)) => override,
_ => style,
}
style
}
let mut line_number = 0;