From dae04f4c214fd81feaebd0bb63c12ab32113ba39 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Sun, 11 Jul 2021 22:05:34 +0200
Subject: [PATCH] Move modules to Quasar namespace
---
quasar.cabal | 14 +++++++-------
src/{Data => Quasar}/Observable.hs | 2 +-
src/{Data => Quasar}/Observable/Delta.hs | 4 ++--
.../Observable/ObservableHashMap.hs | 6 +++---
.../Observable/ObservablePriority.hs | 4 ++--
.../Observable/ObservableHashMapSpec.hs | 8 ++++----
.../Observable/ObservablePrioritySpec.hs | 8 ++++----
test/{Data => Quasar}/ObservableSpec.hs | 4 ++--
8 files changed, 25 insertions(+), 25 deletions(-)
rename src/{Data => Quasar}/Observable.hs (99%)
rename src/{Data => Quasar}/Observable/Delta.hs (97%)
rename src/{Data => Quasar}/Observable/ObservableHashMap.hs (98%)
rename src/{Data => Quasar}/Observable/ObservablePriority.hs (98%)
rename test/{Data => Quasar}/Observable/ObservableHashMapSpec.hs (96%)
rename test/{Data => Quasar}/Observable/ObservablePrioritySpec.hs (86%)
rename test/{Data => Quasar}/ObservableSpec.hs (95%)
diff --git a/quasar.cabal b/quasar.cabal
index f8b4bcb..1c0f83f 100644
--- a/quasar.cabal
+++ b/quasar.cabal
@@ -61,10 +61,10 @@ common shared-executable-properties
library
import: shared-properties
exposed-modules:
- Data.Observable
- Data.Observable.Delta
- Data.Observable.ObservableHashMap
- Data.Observable.ObservablePriority
+ Quasar.Observable
+ Quasar.Observable.Delta
+ Quasar.Observable.ObservableHashMap
+ Quasar.Observable.ObservablePriority
Quasar.Prelude
Quasar.PreludeExtras
Quasar.Utils.ExtraT
@@ -79,8 +79,8 @@ test-suite quasar-test
hspec,
main-is: Spec.hs
other-modules:
- Data.ObservableSpec
- Data.Observable.ObservableHashMapSpec
- Data.Observable.ObservablePrioritySpec
+ Quasar.ObservableSpec
+ Quasar.Observable.ObservableHashMapSpec
+ Quasar.Observable.ObservablePrioritySpec
hs-source-dirs:
test
diff --git a/src/Data/Observable.hs b/src/Quasar/Observable.hs
similarity index 99%
rename from src/Data/Observable.hs
rename to src/Quasar/Observable.hs
index 64de7ae..e0b3b91 100644
--- a/src/Data/Observable.hs
+++ b/src/Quasar/Observable.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE UndecidableInstances #-}
-module Data.Observable (
+module Quasar.Observable (
Observable(..),
IsGettable(..),
IsObservable(..),
diff --git a/src/Data/Observable/Delta.hs b/src/Quasar/Observable/Delta.hs
similarity index 97%
rename from src/Data/Observable/Delta.hs
rename to src/Quasar/Observable/Delta.hs
index 6ec8d81..3bdd0b6 100644
--- a/src/Data/Observable/Delta.hs
+++ b/src/Quasar/Observable/Delta.hs
@@ -1,6 +1,6 @@
-module Data.Observable.Delta where
+module Quasar.Observable.Delta where
-import Data.Observable
+import Quasar.Observable
import Quasar.Prelude
--import Conduit
diff --git a/src/Data/Observable/ObservableHashMap.hs b/src/Quasar/Observable/ObservableHashMap.hs
similarity index 98%
rename from src/Data/Observable/ObservableHashMap.hs
rename to src/Quasar/Observable/ObservableHashMap.hs
index 31a854a..a0f3a7f 100644
--- a/src/Data/Observable/ObservableHashMap.hs
+++ b/src/Quasar/Observable/ObservableHashMap.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE ViewPatterns #-}
-module Data.Observable.ObservableHashMap (
+module Quasar.Observable.ObservableHashMap (
ObservableHashMap,
new,
observeKey,
@@ -10,8 +10,8 @@ module Data.Observable.ObservableHashMap (
lookupDelete,
) where
-import Data.Observable
-import Data.Observable.Delta
+import Quasar.Observable
+import Quasar.Observable.Delta
import Quasar.Prelude hiding (lookup, lookupDelete)
import Quasar.Utils.ExtraT
diff --git a/src/Data/Observable/ObservablePriority.hs b/src/Quasar/Observable/ObservablePriority.hs
similarity index 98%
rename from src/Data/Observable/ObservablePriority.hs
rename to src/Quasar/Observable/ObservablePriority.hs
index d014afb..d7f4415 100644
--- a/src/Data/Observable/ObservablePriority.hs
+++ b/src/Quasar/Observable/ObservablePriority.hs
@@ -1,10 +1,10 @@
-module Data.Observable.ObservablePriority (
+module Quasar.Observable.ObservablePriority (
ObservablePriority,
create,
insertValue,
) where
-import Data.Observable
+import Quasar.Observable
import Quasar.Prelude
import Control.Concurrent.MVar
diff --git a/test/Data/Observable/ObservableHashMapSpec.hs b/test/Quasar/Observable/ObservableHashMapSpec.hs
similarity index 96%
rename from test/Data/Observable/ObservableHashMapSpec.hs
rename to test/Quasar/Observable/ObservableHashMapSpec.hs
index ef8b003..c6c7781 100644
--- a/test/Data/Observable/ObservableHashMapSpec.hs
+++ b/test/Quasar/Observable/ObservableHashMapSpec.hs
@@ -1,8 +1,8 @@
-module Data.Observable.ObservableHashMapSpec where
+module Quasar.Observable.ObservableHashMapSpec where
-import Data.Observable
-import Data.Observable.Delta
-import qualified Data.Observable.ObservableHashMap as OM
+import Quasar.Observable
+import Quasar.Observable.Delta
+import qualified Quasar.Observable.ObservableHashMap as OM
import Control.Monad (void)
import qualified Data.HashMap.Strict as HM
diff --git a/test/Data/Observable/ObservablePrioritySpec.hs b/test/Quasar/Observable/ObservablePrioritySpec.hs
similarity index 86%
rename from test/Data/Observable/ObservablePrioritySpec.hs
rename to test/Quasar/Observable/ObservablePrioritySpec.hs
index a0111d1..ee10ddf 100644
--- a/test/Data/Observable/ObservablePrioritySpec.hs
+++ b/test/Quasar/Observable/ObservablePrioritySpec.hs
@@ -1,8 +1,8 @@
-module Data.Observable.ObservablePrioritySpec where
+module Quasar.Observable.ObservablePrioritySpec where
-import Data.Observable
-import Data.Observable.ObservablePriority (ObservablePriority)
-import qualified Data.Observable.ObservablePriority as OP
+import Quasar.Observable
+import Quasar.Observable.ObservablePriority (ObservablePriority)
+import qualified Quasar.Observable.ObservablePriority as OP
import Control.Monad (void)
import Data.IORef
diff --git a/test/Data/ObservableSpec.hs b/test/Quasar/ObservableSpec.hs
similarity index 95%
rename from test/Data/ObservableSpec.hs
rename to test/Quasar/ObservableSpec.hs
index a5d6eca..f3a57df 100644
--- a/test/Data/ObservableSpec.hs
+++ b/test/Quasar/ObservableSpec.hs
@@ -1,6 +1,6 @@
-module Data.ObservableSpec where
+module Quasar.ObservableSpec where
-import Data.Observable
+import Quasar.Observable
import Control.Monad (void)
import Data.IORef
--
GitLab