From 9baebbd1867cf7bfd7a3074d7382a86e3665d3ab Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Fri, 1 Sep 2017 17:32:38 +0700
Subject: [PATCH] Slight tweak of FaceRegistry::FaceOrAlias definition

---
 src/face_registry.cc | 44 ++++++++++++++++++++++----------------------
 src/face_registry.hh |  7 ++-----
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/src/face_registry.cc b/src/face_registry.cc
index 8d509f04..44de9953 100644
--- a/src/face_registry.cc
+++ b/src/face_registry.cc
@@ -99,28 +99,28 @@ CandidateList FaceRegistry::complete_alias_name(StringView prefix,
 
 FaceRegistry::FaceRegistry()
     : m_aliases{
-        { "Default", Face{ Color::Default, Color::Default } },
-        { "PrimarySelection", Face{ Color::White, Color::Blue } },
-        { "SecondarySelection", Face{ Color::Black, Color::Blue } },
-        { "PrimaryCursor", Face{ Color::Black, Color::White } },
-        { "SecondaryCursor", Face{ Color::Black, Color::White } },
-        { "LineNumbers", Face{ Color::Default, Color::Default } },
-        { "LineNumberCursor", Face{ Color::Default, Color::Default, Attribute::Reverse } },
-        { "LineNumbersWrapped", Face{ Color::Default, Color::Default, Attribute::Italic } },
-        { "MenuForeground", Face{ Color::White, Color::Blue } },
-        { "MenuBackground", Face{ Color::Blue, Color::White } },
-        { "MenuInfo", Face{ Color::Cyan, Color::Default } },
-        { "Information", Face{ Color::Black, Color::Yellow } },
-        { "Error", Face{ Color::Black, Color::Red } },
-        { "StatusLine", Face{ Color::Cyan, Color::Default } },
-        { "StatusLineMode", Face{ Color::Yellow, Color::Default } },
-        { "StatusLineInfo", Face{ Color::Blue, Color::Default } },
-        { "StatusLineValue", Face{ Color::Green, Color::Default } },
-        { "StatusCursor", Face{ Color::Black, Color::Cyan } },
-        { "Prompt", Face{ Color::Yellow, Color::Default } },
-        { "MatchingChar", Face{ Color::Default, Color::Default, Attribute::Bold } },
-        { "BufferPadding", Face{ Color::Blue, Color::Default } },
-        { "Whitespace", Face{ Color::Default, Color::Default } },
+        { "Default", {Face{ Color::Default, Color::Default }} },
+        { "PrimarySelection", {Face{ Color::White, Color::Blue }} },
+        { "SecondarySelection", {Face{ Color::Black, Color::Blue }} },
+        { "PrimaryCursor", {Face{ Color::Black, Color::White }} },
+        { "SecondaryCursor", {Face{ Color::Black, Color::White }} },
+        { "LineNumbers", {Face{ Color::Default, Color::Default }} },
+        { "LineNumberCursor", {Face{ Color::Default, Color::Default, Attribute::Reverse }} },
+        { "LineNumbersWrapped", {Face{ Color::Default, Color::Default, Attribute::Italic }} },
+        { "MenuForeground", {Face{ Color::White, Color::Blue }} },
+        { "MenuBackground", {Face{ Color::Blue, Color::White }} },
+        { "MenuInfo", {Face{ Color::Cyan, Color::Default }} },
+        { "Information", {Face{ Color::Black, Color::Yellow }} },
+        { "Error", {Face{ Color::Black, Color::Red }} },
+        { "StatusLine", {Face{ Color::Cyan, Color::Default }} },
+        { "StatusLineMode", {Face{ Color::Yellow, Color::Default }} },
+        { "StatusLineInfo", {Face{ Color::Blue, Color::Default }} },
+        { "StatusLineValue", {Face{ Color::Green, Color::Default }} },
+        { "StatusCursor", {Face{ Color::Black, Color::Cyan }} },
+        { "Prompt", {Face{ Color::Yellow, Color::Default }} },
+        { "MatchingChar", {Face{ Color::Default, Color::Default, Attribute::Bold }} },
+        { "BufferPadding", {Face{ Color::Blue, Color::Default }} },
+        { "Whitespace", {Face{ Color::Default, Color::Default }} },
       }
 {}
 
diff --git a/src/face_registry.hh b/src/face_registry.hh
index 1d493b0b..bbb3ea0b 100644
--- a/src/face_registry.hh
+++ b/src/face_registry.hh
@@ -23,12 +23,9 @@ public:
 private:
     struct FaceOrAlias
     {
-        Face face;
-        String alias;
-
-        FaceOrAlias(Face face = Face{}) : face(face) {}
+        Face face = {};
+        String alias = {};
     };
-
     using AliasMap = HashMap<String, FaceOrAlias, MemoryDomain::Faces>;
     AliasMap m_aliases;
 };