55a8771 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

Support ghc-8.2.1

commit55a87718c88cd4429878609cd4b241182d3d08e9 authorRyan Trinkle <ryan.trinkle@gmail.com> dateThu 31 Aug 2017, 20:18 (9 years ago) parent06656e2

5 files changed+5−6

compare with develop

unifiedsplit

reflex-dom-core/reflex-dom-core.cabal+2−2 reflex-dom-core/src/Foreign/JavaScript/TH.hs+1−1 reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+1−1 reflex-dom-core/src/Reflex/Dom/Specializations.hs−1 reflex-dom-core/src/Reflex/Dom/WebSocket/Foreign.hs+1−1

reflex-dom-core/reflex-dom-core.cabal+2−2

@@ -71,7 +71,7 @@ library

7171 stm == 2.4.*,

7272 text == 1.2.*,

7373 these >= 0.4 && < 0.8,

74− time >= 1.4 && < 1.8,

74+ time >= 1.4 && < 1.9,

7575 transformers >= 0.3 && < 0.6,

7676 unbounded-delays >= 0.1.0.9 && < 0.2,

7777 zenc == 0.1.*

@@ -145,7 +145,7 @@ library

145145 dependent-sum == 0.4.*

146146

147147test-suite hlint

148− build-depends: base, hlint == 1.9.*

148+ build-depends: base, hlint

149149 hs-source-dirs: test

150150 main-is: hlint.hs

151151 type: exitcode-stdio-1.0

reflex-dom-core/src/Foreign/JavaScript/TH.hs+1−1

@@ -423,7 +423,7 @@ instance MonadJS (JSCtx_JavaScriptCore x) (WithJSContext x IO) where

423423 f $ JSUint8Array payloadRef

424424 fromJSArray (JSRef_JavaScriptCore a) = liftJSM $ do

425425 len <- round <$> (valToNumber =<< (a ^. js "length"))

426− forM [0..len-1] $ \i -> JSRef_JavaScriptCore <$> a !! i

426+ forM [0..len-1] $ fmap JSRef_JavaScriptCore . (a !!)

427427 fromJSUint8Array a = do

428428 vals <- fromJSArray a

429429 doubles <- mapM fromJSNumber vals

reflex-dom-core/src/Reflex/Dom/Builder/Class.hs+1−1

@@ -649,7 +649,7 @@ instance MonadTransControlStateless (ReaderT r)

649649type RunStateless t = forall n b. Monad n => t n b -> n b

650650

651651liftWithStateless :: forall m t a. (Monad m, MonadTransControlStateless t) => (RunStateless t -> m a) -> t m a

652−liftWithStateless a = liftWith $ \run -> a $ \x -> fromStT (Proxy :: Proxy t) <$> run x

652+liftWithStateless a = liftWith $ \run -> a $ fmap (fromStT (Proxy :: Proxy t)) . run

653653

654654liftTextNode :: (MonadTrans f, DomBuilder t m) => TextNodeConfig t -> f m (TextNode (DomBuilderSpace m) t)

655655liftTextNode = lift . textNode

reflex-dom-core/src/Reflex/Dom/Specializations.hs−1

@@ -1,6 +1,5 @@

11{-# LANGUAGE FlexibleContexts #-}

22{-# LANGUAGE GADTs #-}

3−{-# LANGUAGE OverloadedStrings #-}

43{-# LANGUAGE Rank2Types #-}

54{-# LANGUAGE ScopedTypeVariables #-}

65module Reflex.Dom.Specializations where

reflex-dom-core/src/Reflex/Dom/WebSocket/Foreign.hs+1−1

@@ -80,4 +80,4 @@ newWebSocket _ url onMessage onOpen onError onClose = do

8080 return $ JSWebSocket ws

8181

8282onBSMessage :: Either ByteString JSVal -> JSM ByteString

83−onBSMessage = either return (\v -> encodeUtf8 <$> fromJSValUnchecked v)

83+onBSMessage = either return $ fmap encodeUtf8 . fromJSValUnchecked