switch to universum prelude

also don't keep adjusted maps around if not necessary

1 files changed, 10 insertions, 16 deletions

diff --git a/lib/Tiled.hs b/lib/Tiled.hs
index ab7d4f4..3162dfd 100644
--- a/lib/Tiled.hs
+++ b/lib/Tiled.hs
@@ -17,21 +17,15 @@
 -- http://doc.mapeditor.org/en/latest/reference/tmx-map-format/
 module Tiled where
 
-import           Control.DeepSeq        (NFData)
-import           Control.Exception      (try)
-import           Control.Exception.Base (SomeException)
-import           Data.Aeson             hiding (Object)
-import qualified Data.Aeson             as A
-import           Data.Aeson.Types       (typeMismatch)
-import qualified Data.ByteString        as BS
-import qualified Data.ByteString.Lazy   as LB
-import           Data.Char              (toLower)
-import           Data.Map               (Map)
-import           Data.String            (IsString (fromString))
-import           Data.Text              (Text)
-import qualified Data.Text              as T
-import           Data.Vector            (Vector)
-import           GHC.Generics           (Generic)
+import           Universum
+
+-- TODO: what ever are these aeson imports
+import           Data.Aeson           hiding (Object)
+import qualified Data.Aeson           as A
+import           Data.Aeson.Types     (typeMismatch)
+import qualified Data.ByteString      as BS
+import qualified Data.ByteString.Lazy as LB
+import           Data.Char            (toLower)
 
 
 -- | options for Aeson's generic encoding and parsing functions
@@ -68,7 +62,7 @@ data PropertyValue = StrProp Text | BoolProp Bool | IntProp Int | FloatProp Floa
   deriving (Eq, Generic, Show, NFData)
 
 instance IsString PropertyValue where
-  fromString s = StrProp (T.pack s)
+  fromString s = StrProp (toText s)
 
 instance FromJSON Property where
   parseJSON (A.Object o) = do