From dfc67dd5826a24d13dca25426dee4bdfaceadc3e Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Sun, 15 Dec 2019 10:45:28 +1100 Subject: [PATCH] Code style tweak --- src/highlighters.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/highlighters.cc b/src/highlighters.cc index a8f4c4333..fceb1e688 100644 --- a/src/highlighters.cc +++ b/src/highlighters.cc @@ -920,10 +920,8 @@ struct WrapHighlighter : Highlighter ParameterDesc::Flags::None, 0, 0 }; ParametersParser parser(params, param_desc); - - ColumnCount max_width{std::numeric_limits::max()}; - if (auto width = parser.get_switch("width")) - max_width = str_to_int(*width); + ColumnCount max_width = parser.get_switch("width").map(str_to_int) + .value_or(std::numeric_limits::max()); return std::make_unique(max_width, (bool)parser.get_switch("word"), (bool)parser.get_switch("indent"), @@ -1162,9 +1160,9 @@ private: return digit_count; } - const bool m_relative; - const bool m_hl_cursor_line; - const String m_separator; + const bool m_relative; + const bool m_hl_cursor_line; + const String m_separator; }; constexpr StringView LineNumbersHighlighter::ms_id;