ilyakooo0/reflex
1
0
Fork 0
mirror of https://github.com/ilyakooo0/reflex.git synced 2024-11-20 19:09:55 +03:00
Code Issues Projects Releases Wiki Activity

Fix lint failures; Remove overridden dependent-map

Browse Source
This commit is contained in:
Ali Abrar 2019-08-05 00:02:36 -04:00
parent 8ea09b3afa
commit 9a63788b30
17 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -120,11 +120,6 @@ install:
- |
echo "packages: ." >> cabal.project
- |
echo "source-repository-package" >> cabal.project
echo " type: git" >> cabal.project
echo " location: https://github.com/obsidiansystems/dependent-map.git" >> cabal.project
echo " tag: a9a438b1fd974891e4ed57cbd43e305cf7c759a9" >> cabal.project
echo "" >> cabal.project
echo "source-repository-package" >> cabal.project
echo " type: git" >> cabal.project
echo " location: https://github.com/phadej/monoidal-containers.git" >> cabal.project
@ -152,11 +147,6 @@ script:
- |
echo "packages: ${PKGDIR_reflex}" >> cabal.project
- |
echo "source-repository-package" >> cabal.project
echo " type: git" >> cabal.project
echo " location: https://github.com/obsidiansystems/dependent-map.git" >> cabal.project
echo " tag: a9a438b1fd974891e4ed57cbd43e305cf7c759a9" >> cabal.project
echo "" >> cabal.project
echo "source-repository-package" >> cabal.project
echo " type: git" >> cabal.project
echo " location: https://github.com/phadej/monoidal-containers.git" >> cabal.project

5
cabal.project
View File

@ -1,6 +1 @@
packages: .
source-repository-package
type: git
location: https://github.com/phadej/monoidal-containers.git
tag: f8860ba08385f77128efb45fb9193e6d287e893f

1
src/Data/Functor/Misc.hs
View File

@ -4,7 +4,6 @@
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE PatternSynonyms #-}

1
src/Reflex/Adjustable/Class.hs
View File

@ -3,7 +3,6 @@
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-}

1
src/Reflex/BehaviorWriter/Class.hs
View File

@ -5,7 +5,6 @@ Description: This module defines the 'MonadBehaviorWriter' class
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE UndecidableInstances #-}
#ifdef USE_REFLEX_OPTIMIZER
{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

1
src/Reflex/Class.hs
View File

@ -7,7 +7,6 @@
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE NoMonomorphismRestriction #-}
{-# LANGUAGE PolyKinds #-}
{-# LANGUAGE RankNTypes #-}

1
src/Reflex/EventWriter/Class.hs
View File

@ -2,7 +2,6 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE UndecidableInstances #-}
#ifdef USE_REFLEX_OPTIMIZER
{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

1
src/Reflex/Host/Class.hs
View File

@ -4,7 +4,6 @@
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE RoleAnnotations #-}
{-# LANGUAGE ScopedTypeVariables #-}

1
src/Reflex/NotReady/Class.hs
View File

@ -3,7 +3,6 @@
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE UndecidableInstances #-}
#ifdef USE_REFLEX_OPTIMIZER

1
src/Reflex/PerformEvent/Class.hs
View File

@ -5,7 +5,6 @@
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-}

1
src/Reflex/PostBuild/Class.hs
View File

@ -4,7 +4,6 @@
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}

1
src/Reflex/Query/Base.hs
View File

@ -1,7 +1,6 @@
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE InstanceSigs #-}
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE RankNTypes #-}

1
src/Reflex/Query/Class.hs
View File

@ -3,7 +3,6 @@
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE UndecidableInstances #-}
-- |

1
src/Reflex/Requester/Class.hs
View File

@ -6,7 +6,6 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE RecursiveDo #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE UndecidableInstances #-}

5
src/Reflex/Spider/Internal.hs
View File

@ -9,7 +9,6 @@
{-# LANGUAGE GADTs #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE RoleAnnotations #-}
@ -1752,7 +1751,7 @@ mergeCheap nt = mergeGCheap' getInitialSubscribers updateMe destroy
let s = subscriber $ return k
(subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
height <- liftIO $ getEventSubscribedHeight parentSubd
return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParent subscription)
return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParent subscription)
return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
, fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
, DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers
@ -1800,7 +1799,7 @@ mergeCheapWithMove nt = mergeGCheap' getInitialSubscribers updateMe destroy
let s = subscriber $ liftIO $ readIORef keyRef
(subscription@(EventSubscription _ parentSubd), parentOcc) <- subscribeAndRead (nt e) s
height <- liftIO $ getEventSubscribedHeight parentSubd
return (fmap (\x -> k :=> x) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
return (fmap (k :=>) parentOcc, height, k :=> MergeSubscribedParentWithMove subscription keyRef)
return ( DMap.fromDistinctAscList $ mapMaybe (\(x, _, _) -> x) subscribers
, fmap (\(_, h, _) -> h) subscribers --TODO: Assert that there's no invalidHeight in here
, DMap.fromDistinctAscList $ map (\(_, _, x) -> x) subscribers

5
test/EventWriterT.hs
View File

@ -53,16 +53,13 @@ unwrapApp x appIn = do
return e
testOrdering :: (Reflex t, Monad m) => Event t () -> EventWriterT t [Int] m ()
testOrdering pulse = do
forM_ [10,9..1] $ \i -> tellEvent ([i] <$ pulse)
return ()
testOrdering pulse = forM_ [10,9..1] $ \i -> tellEvent ([i] <$ pulse)
testSimultaneous :: (Reflex t, Adjustable t m, MonadHold t m) => Event t (These () ()) -> EventWriterT t [Int] m ()
testSimultaneous pulse = do
let e0 = fmapMaybe (^? here) pulse
e1 = fmapMaybe (^? there) pulse
forM_ [1,3..9] $ \i -> runWithReplace (tellEvent ([i] <$ e0)) $ ffor e1 $ \_ -> tellEvent ([i+1] <$ e0)
return ()
-- | Test that a widget telling and event which fires at the same time it has been replaced
-- doesn't count along with the new widget.

1
test/hlint.hs
View File

@ -22,6 +22,7 @@ main = do
, "--ignore=Use unless"
, "--ignore=Reduce duplication"
, "--cpp-define=USE_TEMPLATE_HASKELL"
, "--ignore=Use tuple-section"
]
recurseInto = and <$> sequence
[ fileType ==? Directory