From db86c6cbc953a9168eeda629214bcb52a175cd33 Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Tue, 29 Nov 2016 19:12:10 +0000
Subject: [PATCH] Small cleanup in BufferManager code

---
 src/buffer_manager.cc | 11 +++--------
 src/buffer_manager.hh |  6 +++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/buffer_manager.cc b/src/buffer_manager.cc
index ea6519e2..430f8eff 100644
--- a/src/buffer_manager.cc
+++ b/src/buffer_manager.cc
@@ -11,11 +11,6 @@
 namespace Kakoune
 {
 
-struct name_not_unique : runtime_error
-{
-    name_not_unique() : runtime_error("buffer name is already in use") {}
-};
-
 BufferManager::~BufferManager()
 {
     // Move buffers to m_buffer_trash to avoid running BufClose
@@ -37,7 +32,7 @@ Buffer* BufferManager::create_buffer(String name, Buffer::Flags flags,
     {
         if (buf->name() == name or
             (buf->flags() & Buffer::Flags::File and buf->name() == path))
-            throw name_not_unique();
+            throw runtime_error{"buffer name is already in use"};
     }
 
     m_buffers.emplace(m_buffers.begin(),
@@ -46,7 +41,7 @@ Buffer* BufferManager::create_buffer(String name, Buffer::Flags flags,
     buffer.on_registered();
 
     if (contains(m_buffer_trash, &buffer))
-        throw runtime_error("Buffer got removed during its creation");
+        throw runtime_error{"Buffer got removed during its creation"};
 
     return &buffer;
 }
@@ -81,7 +76,7 @@ Buffer& BufferManager::get_buffer(StringView name)
 {
     Buffer* res = get_buffer_ifp(name);
     if (not res)
-        throw runtime_error(format("no such buffer '{}'", name));
+        throw runtime_error{format("no such buffer '{}'", name)};
     return *res;
 }
 
diff --git a/src/buffer_manager.hh b/src/buffer_manager.hh
index 50d75b7d..0abb6415 100644
--- a/src/buffer_manager.hh
+++ b/src/buffer_manager.hh
@@ -2,9 +2,9 @@
 #define buffer_manager_hh_INCLUDED
 
 #include "buffer.hh"
-#include "completion.hh"
-#include "utils.hh"
-#include "safe_ptr.hh"
+#include "vector.hh"
+
+#include <memory>
 
 namespace Kakoune
 {