From 74db430e83a1a7e41db648743dd4153b2d73d564 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Sat, 10 Jul 2021 00:28:01 +0200
Subject: [PATCH] Move modules to Data.Observable
---
quasar.cabal | 7 +++++++
src/{lib/Qd => Data}/Observable.hs | 4 ++--
src/{lib/Qd => Data}/Observable/Delta.hs | 6 +++---
src/{lib/Qd => Data}/Observable/ObservableHashMap.hs | 10 +++++-----
src/{lib/Qd => Data}/Observable/ObservablePriority.hs | 6 +++---
test/{Qd => Data}/Observable/ObservableHashMapSpec.hs | 8 ++++----
test/{Qd => Data}/Observable/ObservablePrioritySpec.hs | 8 ++++----
test/{Qd => Data}/ObservableSpec.hs | 4 ++--
8 files changed, 30 insertions(+), 23 deletions(-)
rename src/{lib/Qd => Data}/Observable.hs (99%)
rename src/{lib/Qd => Data}/Observable/Delta.hs (97%)
rename src/{lib/Qd => Data}/Observable/ObservableHashMap.hs (97%)
rename src/{lib/Qd => Data}/Observable/ObservablePriority.hs (98%)
rename test/{Qd => Data}/Observable/ObservableHashMapSpec.hs (96%)
rename test/{Qd => Data}/Observable/ObservablePrioritySpec.hs (86%)
rename test/{Qd => Data}/ObservableSpec.hs (96%)
diff --git a/quasar.cabal b/quasar.cabal
index 5b08e1d..76a3a11 100644
--- a/quasar.cabal
+++ b/quasar.cabal
@@ -61,6 +61,10 @@ common shared-executable-properties
library
import: shared-properties
exposed-modules:
+ Data.Observable
+ Data.Observable.Delta
+ Data.Observable.ObservableHashMap
+ Data.Observable.ObservablePriority
hs-source-dirs:
src
@@ -72,5 +76,8 @@ test-suite quasar-test
hspec,
main-is: Spec.hs
other-modules:
+ Data.ObservableSpec
+ Data.Observable.ObservableHashMapSpec
+ Data.Observable.ObservablePrioritySpec
hs-source-dirs:
test
diff --git a/src/lib/Qd/Observable.hs b/src/Data/Observable.hs
similarity index 99%
rename from src/lib/Qd/Observable.hs
rename to src/Data/Observable.hs
index 473c9f8..9c8a5ae 100644
--- a/src/lib/Qd/Observable.hs
+++ b/src/Data/Observable.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE UndecidableInstances #-}
-module Qd.Observable (
+module Data.Observable (
Observable(..),
IsGettable(..),
IsObservable(..),
@@ -31,7 +31,7 @@ module Qd.Observable (
waitFor',
) where
-import Qd.Prelude
+import Prelude
import Control.Concurrent.MVar
import Control.Exception (Exception)
diff --git a/src/lib/Qd/Observable/Delta.hs b/src/Data/Observable/Delta.hs
similarity index 97%
rename from src/lib/Qd/Observable/Delta.hs
rename to src/Data/Observable/Delta.hs
index caa6c22..6050363 100644
--- a/src/lib/Qd/Observable/Delta.hs
+++ b/src/Data/Observable/Delta.hs
@@ -1,7 +1,7 @@
-module Qd.Observable.Delta where
+module Data.Observable.Delta where
-import Qd.Observable
-import Qd.Prelude
+import Data.Observable
+import Prelude
--import Conduit
import qualified Data.HashMap.Strict as HM
diff --git a/src/lib/Qd/Observable/ObservableHashMap.hs b/src/Data/Observable/ObservableHashMap.hs
similarity index 97%
rename from src/lib/Qd/Observable/ObservableHashMap.hs
rename to src/Data/Observable/ObservableHashMap.hs
index a85dff8..0ddf815 100644
--- a/src/lib/Qd/Observable/ObservableHashMap.hs
+++ b/src/Data/Observable/ObservableHashMap.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE ViewPatterns #-}
-module Qd.Observable.ObservableHashMap (
+module Data.Observable.ObservableHashMap (
ObservableHashMap,
new,
observeKey,
@@ -10,10 +10,10 @@ module Qd.Observable.ObservableHashMap (
lookupDelete,
) where
-import Qd.Observable
-import Qd.Observable.Delta
-import Qd.Prelude hiding (lookup, lookupDelete)
-import Qd.Utils.ExtraT
+import Data.Observable
+import Data.Observable.Delta
+import Prelude hiding (lookup, lookupDelete)
+import Data.Utils.ExtraT
import Control.Concurrent.MVar
import qualified Data.HashMap.Strict as HM
diff --git a/src/lib/Qd/Observable/ObservablePriority.hs b/src/Data/Observable/ObservablePriority.hs
similarity index 98%
rename from src/lib/Qd/Observable/ObservablePriority.hs
rename to src/Data/Observable/ObservablePriority.hs
index 2e9e74f..aa8f6ff 100644
--- a/src/lib/Qd/Observable/ObservablePriority.hs
+++ b/src/Data/Observable/ObservablePriority.hs
@@ -1,11 +1,11 @@
-module Qd.Observable.ObservablePriority (
+module Data.Observable.ObservablePriority (
ObservablePriority,
create,
insertValue,
) where
-import Qd.Observable
-import Qd.Prelude
+import Data.Observable
+import Prelude
import Control.Concurrent.MVar
import qualified Data.HashMap.Strict as HM
diff --git a/test/Qd/Observable/ObservableHashMapSpec.hs b/test/Data/Observable/ObservableHashMapSpec.hs
similarity index 96%
rename from test/Qd/Observable/ObservableHashMapSpec.hs
rename to test/Data/Observable/ObservableHashMapSpec.hs
index c793603..1fa262a 100644
--- a/test/Qd/Observable/ObservableHashMapSpec.hs
+++ b/test/Data/Observable/ObservableHashMapSpec.hs
@@ -1,8 +1,8 @@
-module Qd.Observable.ObservableHashMapSpec where
+module Data.Observable.ObservableHashMapSpec where
-import Qd
-import Qd.Observable.Delta
-import qualified Qd.Observable.ObservableHashMap as OM
+import Data
+import Data.Observable.Delta
+import qualified Data.Observable.ObservableHashMap as OM
import Control.Monad (void)
import qualified Data.HashMap.Strict as HM
diff --git a/test/Qd/Observable/ObservablePrioritySpec.hs b/test/Data/Observable/ObservablePrioritySpec.hs
similarity index 86%
rename from test/Qd/Observable/ObservablePrioritySpec.hs
rename to test/Data/Observable/ObservablePrioritySpec.hs
index d33701d..a0111d1 100644
--- a/test/Qd/Observable/ObservablePrioritySpec.hs
+++ b/test/Data/Observable/ObservablePrioritySpec.hs
@@ -1,8 +1,8 @@
-module Qd.Observable.ObservablePrioritySpec where
+module Data.Observable.ObservablePrioritySpec where
-import Qd.Observable
-import Qd.Observable.ObservablePriority (ObservablePriority)
-import qualified Qd.Observable.ObservablePriority as OP
+import Data.Observable
+import Data.Observable.ObservablePriority (ObservablePriority)
+import qualified Data.Observable.ObservablePriority as OP
import Control.Monad (void)
import Data.IORef
diff --git a/test/Qd/ObservableSpec.hs b/test/Data/ObservableSpec.hs
similarity index 96%
rename from test/Qd/ObservableSpec.hs
rename to test/Data/ObservableSpec.hs
index 62b4699..a5d6eca 100644
--- a/test/Qd/ObservableSpec.hs
+++ b/test/Data/ObservableSpec.hs
@@ -1,6 +1,6 @@
-module Qd.ObservableSpec where
+module Data.ObservableSpec where
-import Qd.Observable
+import Data.Observable
import Control.Monad (void)
import Data.IORef
--
GitLab