9a63788 · patch · git.iko.soy

.travis.yml−10

compare with develop

unifiedsplit

@@ -120,11 +120,6 @@ install:

120 - |

121 echo "packages: ." >> cabal.project

122 - |

123− echo "source-repository-package" >> cabal.project

124− echo " type: git" >> cabal.project

125− echo " location: https://github.com/obsidiansystems/dependent-map.git" >> cabal.project

126− echo " tag: a9a438b1fd974891e4ed57cbd43e305cf7c759a9" >> cabal.project

127− echo "" >> cabal.project

128 echo "source-repository-package" >> cabal.project

123 echo "source-repository-package" >> cabal.project

129 echo " type: git" >> cabal.project

124 echo " type: git" >> cabal.project

130 echo " location: https://github.com/phadej/monoidal-containers.git" >> cabal.project

125 echo " location: https://github.com/phadej/monoidal-containers.git" >> cabal.project

@@ -152,11 +147,6 @@ script:

152 - |

147 - |

153 echo "packages: ${PKGDIR_reflex}" >> cabal.project

148 echo "packages: ${PKGDIR_reflex}" >> cabal.project

154 - |

149 - |

155− echo "source-repository-package" >> cabal.project

156− echo " type: git" >> cabal.project

157− echo " location: https://github.com/obsidiansystems/dependent-map.git" >> cabal.project

158− echo " tag: a9a438b1fd974891e4ed57cbd43e305cf7c759a9" >> cabal.project

159− echo "" >> cabal.project

160 echo "source-repository-package" >> cabal.project

150 echo "source-repository-package" >> cabal.project

161 echo " type: git" >> cabal.project

151 echo " type: git" >> cabal.project

162 echo " location: https://github.com/phadej/monoidal-containers.git" >> cabal.project

152 echo " location: https://github.com/phadej/monoidal-containers.git" >> cabal.project

cabal.project−5

@@ -1,6 +1 @@

1packages: .

2−

3−source-repository-package

4− type: git

5− location: https://github.com/phadej/monoidal-containers.git

6− tag: f8860ba08385f77128efb45fb9193e6d287e893f

src/Data/Functor/Misc.hs−1

@@ -4,7 +4,6 @@

4{-# LANGUAGE FlexibleContexts #-}

5{-# LANGUAGE FlexibleInstances #-}

6{-# LANGUAGE GADTs #-}

7−{-# LANGUAGE KindSignatures #-}

8{-# LANGUAGE LambdaCase #-}

7{-# LANGUAGE LambdaCase #-}

9{-# LANGUAGE MultiParamTypeClasses #-}

8{-# LANGUAGE MultiParamTypeClasses #-}

10{-# LANGUAGE PatternSynonyms #-}

9{-# LANGUAGE PatternSynonyms #-}

src/Reflex/Adjustable/Class.hs−1

@@ -3,7 +3,6 @@

3{-# LANGUAGE FlexibleInstances #-}

4{-# LANGUAGE FunctionalDependencies #-}

5{-# LANGUAGE LambdaCase #-}

6−{-# LANGUAGE MultiParamTypeClasses #-}

7{-# LANGUAGE RankNTypes #-}

6{-# LANGUAGE RankNTypes #-}

8{-# LANGUAGE ScopedTypeVariables #-}

7{-# LANGUAGE ScopedTypeVariables #-}

9{-# LANGUAGE TypeFamilies #-}

8{-# LANGUAGE TypeFamilies #-}

src/Reflex/BehaviorWriter/Class.hs−1

@@ -5,7 +5,6 @@ Description: This module defines the 'MonadBehaviorWriter' class

5{-# LANGUAGE CPP #-}

6{-# LANGUAGE FlexibleInstances #-}

7{-# LANGUAGE FunctionalDependencies #-}

8−{-# LANGUAGE MultiParamTypeClasses #-}

9{-# LANGUAGE UndecidableInstances #-}

8{-# LANGUAGE UndecidableInstances #-}

10#ifdef USE_REFLEX_OPTIMIZER

9#ifdef USE_REFLEX_OPTIMIZER

11{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

10{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

src/Reflex/Class.hs−1

@@ -7,7 +7,6 @@

7{-# LANGUAGE FunctionalDependencies #-}

8{-# LANGUAGE GADTs #-}

9{-# LANGUAGE LambdaCase #-}

10−{-# LANGUAGE MultiParamTypeClasses #-}

11{-# LANGUAGE NoMonomorphismRestriction #-}

10{-# LANGUAGE NoMonomorphismRestriction #-}

12{-# LANGUAGE PolyKinds #-}

11{-# LANGUAGE PolyKinds #-}

13{-# LANGUAGE RankNTypes #-}

12{-# LANGUAGE RankNTypes #-}

src/Reflex/EventWriter/Class.hs−1

@@ -2,7 +2,6 @@

2{-# LANGUAGE CPP #-}

3{-# LANGUAGE FlexibleInstances #-}

4{-# LANGUAGE FunctionalDependencies #-}

5−{-# LANGUAGE MultiParamTypeClasses #-}

6{-# LANGUAGE UndecidableInstances #-}

5{-# LANGUAGE UndecidableInstances #-}

7#ifdef USE_REFLEX_OPTIMIZER

6#ifdef USE_REFLEX_OPTIMIZER

8{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

7{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

src/Reflex/Host/Class.hs−1

@@ -4,7 +4,6 @@

4{-# LANGUAGE FlexibleInstances #-}

5{-# LANGUAGE FunctionalDependencies #-}

6{-# LANGUAGE GADTs #-}

7−{-# LANGUAGE MultiParamTypeClasses #-}

8{-# LANGUAGE RankNTypes #-}

7{-# LANGUAGE RankNTypes #-}

9{-# LANGUAGE RoleAnnotations #-}

8{-# LANGUAGE RoleAnnotations #-}

10{-# LANGUAGE ScopedTypeVariables #-}

9{-# LANGUAGE ScopedTypeVariables #-}

src/Reflex/NotReady/Class.hs−1

@@ -3,7 +3,6 @@

3{-# LANGUAGE FlexibleContexts #-}

4{-# LANGUAGE FlexibleInstances #-}

5{-# LANGUAGE FunctionalDependencies #-}

6−{-# LANGUAGE MultiParamTypeClasses #-}

7{-# LANGUAGE TypeFamilies #-}

6{-# LANGUAGE TypeFamilies #-}

8{-# LANGUAGE UndecidableInstances #-}

7{-# LANGUAGE UndecidableInstances #-}

9#ifdef USE_REFLEX_OPTIMIZER

8#ifdef USE_REFLEX_OPTIMIZER

src/Reflex/PerformEvent/Class.hs−1

@@ -5,7 +5,6 @@

5{-# LANGUAGE FlexibleContexts #-}

6{-# LANGUAGE FlexibleInstances #-}

7{-# LANGUAGE FunctionalDependencies #-}

8−{-# LANGUAGE MultiParamTypeClasses #-}

9{-# LANGUAGE RankNTypes #-}

8{-# LANGUAGE RankNTypes #-}

10{-# LANGUAGE ScopedTypeVariables #-}

9{-# LANGUAGE ScopedTypeVariables #-}

11{-# LANGUAGE TypeFamilies #-}

10{-# LANGUAGE TypeFamilies #-}

src/Reflex/PostBuild/Class.hs−1

@@ -4,7 +4,6 @@

4{-# LANGUAGE DataKinds #-}

5{-# LANGUAGE FlexibleInstances #-}

6{-# LANGUAGE FunctionalDependencies #-}

7−{-# LANGUAGE MultiParamTypeClasses #-}

8{-# LANGUAGE ScopedTypeVariables #-}

7{-# LANGUAGE ScopedTypeVariables #-}

9{-# LANGUAGE TypeFamilies #-}

8{-# LANGUAGE TypeFamilies #-}

10{-# LANGUAGE TypeOperators #-}

9{-# LANGUAGE TypeOperators #-}

src/Reflex/Query/Base.hs−1

@@ -1,7 +1,6 @@

1{-# LANGUAGE FlexibleInstances #-}

2{-# LANGUAGE GeneralizedNewtypeDeriving #-}

3{-# LANGUAGE InstanceSigs #-}

4−{-# LANGUAGE KindSignatures #-}

5{-# LANGUAGE LambdaCase #-}

4{-# LANGUAGE LambdaCase #-}

6{-# LANGUAGE MultiParamTypeClasses #-}

5{-# LANGUAGE MultiParamTypeClasses #-}

7{-# LANGUAGE RankNTypes #-}

6{-# LANGUAGE RankNTypes #-}

src/Reflex/Query/Class.hs−1

@@ -3,7 +3,6 @@

3{-# LANGUAGE FlexibleInstances #-}

4{-# LANGUAGE FunctionalDependencies #-}

5{-# LANGUAGE GeneralizedNewtypeDeriving #-}

6−{-# LANGUAGE MultiParamTypeClasses #-}

7{-# LANGUAGE TypeFamilies #-}

6{-# LANGUAGE TypeFamilies #-}

8{-# LANGUAGE UndecidableInstances #-}

7{-# LANGUAGE UndecidableInstances #-}

9-- |

8-- |

src/Reflex/Requester/Class.hs−1

@@ -6,7 +6,6 @@

6{-# LANGUAGE CPP #-}

7{-# LANGUAGE FlexibleInstances #-}

8{-# LANGUAGE FunctionalDependencies #-}

9−{-# LANGUAGE MultiParamTypeClasses #-}

10{-# LANGUAGE RecursiveDo #-}

9{-# LANGUAGE RecursiveDo #-}

11{-# LANGUAGE TypeFamilies #-}

10{-# LANGUAGE TypeFamilies #-}

12{-# LANGUAGE UndecidableInstances #-}

11{-# LANGUAGE UndecidableInstances #-}

src/Reflex/Spider/Internal.hs+2−3

@@ -9,7 +9,6 @@

9{-# LANGUAGE GADTs #-}

10{-# LANGUAGE GeneralizedNewtypeDeriving #-}

11{-# LANGUAGE LambdaCase #-}

12−{-# LANGUAGE MultiParamTypeClasses #-}

13{-# LANGUAGE MultiWayIf #-}

12{-# LANGUAGE MultiWayIf #-}

14{-# LANGUAGE RankNTypes #-}

13{-# LANGUAGE RankNTypes #-}

15{-# LANGUAGE RoleAnnotations #-}

14{-# LANGUAGE RoleAnnotations #-}

@@ -1752,7 +1751,7 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy

1752 let s = subscriber $ return k

1751 let s = subscriber $ return k

1753 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s

1752 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s

1754 height <- liftIO $ getEventSubscribedHeight parentSubd

1753 height <- liftIO $ getEventSubscribedHeight parentSubd

1755− return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParent subscription)

1754+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)

1756 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers

1755 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers

1757 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here

1756 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here

1758 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers

1757 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers

@@ -1800,7 +1799,7 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy

1800 let s = subscriber $ liftIO $ readIORef keyRef

1799 let s = subscriber $ liftIO $ readIORef keyRef

1801 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s

1800 (subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s

1802 height <- liftIO $ getEventSubscribedHeight parentSubd

1801 height <- liftIO $ getEventSubscribedHeight parentSubd

1803− return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)

1802+ return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)

1804 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers

1803 return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers

1805 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here

1804 , fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here

1806 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers

1805 , DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers

test/EventWriterT.hs+1−4

@@ -53,16 +53,13 @@ unwrapApp x appIn = do

53 return e

54

55testOrdering :: (Reflex t, Monad m) => Event t () -> EventWriterT t [Int] m ()

56−testOrdering pulse = do

57− forM_ [10,9..1] $ \i -> tellEvent ([i] <$ pulse)

56+testOrdering pulse = forM_ [10,9..1] $ \i -> tellEvent ([i] <$ pulse)

58− return ()

59

57

60testSimultaneous :: (Reflex t, Adjustable t m, MonadHold t m) => Event t (These () ()) -> EventWriterT t [Int] m ()

58testSimultaneous :: (Reflex t, Adjustable t m, MonadHold t m) => Event t (These () ()) -> EventWriterT t [Int] m ()

61testSimultaneous pulse = do

59testSimultaneous pulse = do

62 let e0 = fmapMaybe (^? here) pulse

60 let e0 = fmapMaybe (^? here) pulse

63 e1 = fmapMaybe (^? there) pulse

61 e1 = fmapMaybe (^? there) pulse

64 forM_ [1,3..9] $ \i -> runWithReplace (tellEvent ([i] <$ e0)) $ ffor e1 $ \_ -> tellEvent ([i+1] <$ e0)

62 forM_ [1,3..9] $ \i -> runWithReplace (tellEvent ([i] <$ e0)) $ ffor e1 $ \_ -> tellEvent ([i+1] <$ e0)

65− return ()

66

63

67-- | Test that a widget telling and event which fires at the same time it has been replaced

64-- | Test that a widget telling and event which fires at the same time it has been replaced

68-- doesn't count along with the new widget.

65-- doesn't count along with the new widget.

test/hlint.hs+1

@@ -22,6 +22,7 @@ main = do

22 , "--ignore=Use unless"

23 , "--ignore=Reduce duplication"

24 , "--cpp-define=USE_TEMPLATE_HASKELL"

25+ , "--ignore=Use tuple-section"

25 ]

26 ]

26 recurseInto = and <$> sequence

27 recurseInto = and <$> sequence

27 [ fileType ==? Directory

28 [ fileType ==? Directory