From 7a0725fdaf964fa1bf60eefb0cc5846b687426bf Mon Sep 17 00:00:00 2001
From: AnthonyMikh <anthony.mikh@yandex.ru>
Date: Thu, 26 Sep 2019 00:42:55 +0300
Subject: [PATCH] Simplify `style_or_override`

---
 src/librustc_errors/emitter.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index 7513a9203fe2..b8b7488d8ae4 100644
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -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;