diff --git a/quasar.cabal b/quasar.cabal index f8b4bcbec295aa23f74892d335a1f7b8755cf2b1..1c0f83fbda8c223989a019a0e06a38eb0d884939 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 64de7ae69ad6edbf02930fa9bcab46f6da7fd78b..e0b3b9151b8ca313bd042e3bee3fddda4f9f2b78 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 6ec8d81c11ee81ffa4b918f33570422b5d34974a..3bdd0b633f704718c34aa926017f34ca1b698e65 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 31a854a3a312ae24f61f510b2283fb2726474a5b..a0f3a7fb7e90a9c8cb2cbc698ca577fe26726b04 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 d014afbf801694c3154c2bd5df9c25c9f2ebae94..d7f4415734b51f3b033410bdfbef30b00dff8ebc 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 ef8b0031cd188e52aef073f2271ac7808d33eeaa..c6c7781c97ad587f37001c215f061b2b7b747d77 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 a0111d18f3b6984fcbe1d8160762ccfc80241936..ee10ddf62c00d3172e72b910ed0fd41039ebfc00 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 a5d6ecab73820f3824a4ad4947f611041d0bddf7..f3a57dfe53724320dbfa1d52849c42c1f00ab1fe 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