From d7599fd70e0918ce5871c287574a2dbb21f73f85 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sun, 20 Aug 2017 10:45:23 +0200 Subject: Move `PluginList` out of `Plugin` directory Asking for `Plugin.Plugin...` is redundant. Take this module out of the `Plugin` directory to eliminate the repetition in naming. --- src/Plugin.hs | 2 +- src/Plugin/Help.hs | 2 +- src/Plugin/PluginList.hs | 15 --------------- src/PluginList.hs | 15 +++++++++++++++ 4 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 src/Plugin/PluginList.hs create mode 100644 src/PluginList.hs (limited to 'src') diff --git a/src/Plugin.hs b/src/Plugin.hs index 30b5ab8..9e5bcdd 100644 --- a/src/Plugin.hs +++ b/src/Plugin.hs @@ -10,7 +10,7 @@ import Text.Regex.TDFA import qualified Message as M import Plugin.Base -import qualified Plugin.PluginList as PL (plugins) +import qualified PluginList as PL (plugins) import Plugin.Help -- | Get the first plugin that matches the given message text. diff --git a/src/Plugin/Help.hs b/src/Plugin/Help.hs index a141745..ac38dab 100644 --- a/src/Plugin/Help.hs +++ b/src/Plugin/Help.hs @@ -6,7 +6,7 @@ module Plugin.Help import qualified Data.Text as T -import qualified Plugin.PluginList as PL (plugins) +import qualified PluginList as PL (plugins) import Plugin.Base help = Plugin diff --git a/src/Plugin/PluginList.hs b/src/Plugin/PluginList.hs deleted file mode 100644 index 21f3893..0000000 --- a/src/Plugin/PluginList.hs +++ /dev/null @@ -1,15 +0,0 @@ -module Plugin.PluginList - ( plugins - ) where - -import Plugin.Base (Plugin) -import Plugin.GitHubCommit -import Plugin.GitRemoteSetOrigin - --- | The list of plugins to load, minus the Help plugin, which would otherwise --- cause a circular import. -plugins :: [Plugin] -plugins = - [ gitHubCommit - , gitRemoteSetOrigin - ] diff --git a/src/PluginList.hs b/src/PluginList.hs new file mode 100644 index 0000000..bfcae7e --- /dev/null +++ b/src/PluginList.hs @@ -0,0 +1,15 @@ +module PluginList + ( plugins + ) where + +import Plugin.Base (Plugin) +import Plugin.GitHubCommit +import Plugin.GitRemoteSetOrigin + +-- | The list of plugins to load, minus the Help plugin, which would otherwise +-- cause a circular import. +plugins :: [Plugin] +plugins = + [ gitHubCommit + , gitRemoteSetOrigin + ] -- cgit v1.2.3