git.iko.soy/typeable/katip
on master help sign in
CPP to suppress redundant constraints warning
commit53d90b0b010830d125229e17071f52dd7de4837b authorMichael Xavier <michael@michaelxavier.net> dateTue 11 Jul 2017, 12:33 (9 years ago) parente98b664
3 files changed+23−1
compare with master
unifiedsplit
.travis.yml+1−1 katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Internal.hs+3 katip-elasticsearch/test/Main.hs+19
.travis.yml+1−1
@@ -19,7 +19,7 @@ matrix:
1919 - env: ARGS="--stack-yaml=stack-lts-4.yaml" ESVERSION=1.5.2 ESURL=https://download.elastic.co/elasticsearch/elasticsearch ESTESTARGS="--es-version 1"
2020 - env: ARGS="--stack-yaml=stack-lts-5.yaml" ESVERSION=1.5.2 ESURL=https://download.elastic.co/elasticsearch/elasticsearch ESTESTARGS="--es-version 1"
2121 - env: ARGS="--resolver=lts-6" ESVERSION=1.5.2 ESURL=https://download.elastic.co/elasticsearch/elasticsearch ESTESTARGS="--es-version 1"
22− - env: ARGS="--resolver=lts-7.19" ESVERSION=1.5.2 ESURL=https://download.elastic.co/elasticsearch/elasticsearch ESTESTARGS="--es-version 1"
22+ - env: ARGS="--resolver=lts-7" ESVERSION=1.5.2 ESURL=https://download.elastic.co/elasticsearch/elasticsearch ESTESTARGS="--es-version 1"
2323 - env: ARGS="--resolver=lts-8" ESVERSION=1.5.2 ESURL=https://download.elastic.co/elasticsearch/elasticsearch ESTESTARGS="--es-version 1"
2424 - env: ARGS="--resolver=nightly" ESVERSION=1.5.2 ESURL=https://download.elastic.co/elasticsearch/elasticsearch ESTESTARGS="--es-version 1"
2525 - env: ARGS="--resolver=nightly" ESVERSION=5.5.0 ESURL=https://artifacts.elastic.co/downloads/elasticsearch ESTESTARGS="--es-version 5"
katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Internal.hs+3
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE DeriveDataTypeable #-}
23{-# LANGUAGE FlexibleContexts #-}
34{-# LANGUAGE OverloadedStrings #-}
@@ -255,7 +256,9 @@ instance Exception EsScribeSetupError
255256mkEsScribe
256257 :: forall v. ( ESVersion v
257258 , MonadIO (BH v IO)
259+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 800
258260 , Functor (BH v IO)
261+#endif
259262 )
260263 => EsScribeCfg v
261264 -> BHEnv v
katip-elasticsearch/test/Main.hs+19
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE DeriveDataTypeable #-}
23{-# LANGUAGE FlexibleContexts #-}
34{-# LANGUAGE KindSignatures #-}
@@ -149,7 +150,9 @@ instance TestESVersion ESV5 where
149150setupSearch
150151 :: forall proxy v. ( TestESVersion v
151152 , MonadIO (BH v IO)
153+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 800
152154 , Functor (BH v IO)
155+#endif
153156 )
154157 => proxy v
155158 -> (EsScribeCfg v -> EsScribeCfg v)
@@ -171,7 +174,9 @@ setupSearch prx modScribeCfg = do
171174teardownSearch
172175 :: ( TestESVersion v
173176 , Monad (BH v IO)
177+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 800
174178 , Functor (BH v IO)
179+#endif
175180 )
176181 => proxy v
177182 -> IO ()
@@ -185,7 +190,9 @@ teardownSearch prx = do
185190withSearch
186191 :: ( TestESVersion v
187192 , MonadIO (BH v IO)
193+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 800
188194 , Functor (BH v IO)
195+#endif
189196 )
190197 => proxy v
191198 -> (IO Scribe -> TestTree)
@@ -197,7 +204,9 @@ withSearch = withSearch' id
197204withSearch'
198205 :: ( TestESVersion v
199206 , MonadIO (BH v IO)
207+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 800
200208 , Functor (BH v IO)
209+#endif
201210 )
202211 => (EsScribeCfg v -> EsScribeCfg v)
203212 -> proxy v
@@ -210,7 +219,9 @@ withSearch' modScribeCfg prx = withResource (setupSearch prx modScribeCfg) (cons
210219esTests
211220 :: ( TestESVersion v
212221 , MonadIO (BH v IO)
222+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 800
213223 , Functor (BH v IO)
224+#endif
214225 , Show (IndexName v)
215226 )
216227 => proxy v
@@ -371,7 +382,9 @@ annotatedExampleValue = Array $ V.fromList
371382getLogs
372383 :: ( TestESVersion v
373384 , Monad (BH v IO)
385+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 800
374386 , Functor (BH v IO)
387+#endif
375388 , Show (IndexName v)
376389 )
377390 => proxy v
@@ -383,7 +396,9 @@ getLogs prx = getLogsByIndex prx (ixn prx)
383396getLogsByIndex
384397 :: ( TestESVersion v
385398 , Monad (BH v IO)
399+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 800
386400 , Functor (BH v IO)
401+#endif
387402 , Show (IndexName v)
388403 )
389404 => proxy v
@@ -465,7 +480,9 @@ mn prx = toMappingName prx "logs"
465480dropESSchema
466481 :: ( TestESVersion v
467482 , Monad (BH v IO)
483+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 800
468484 , Functor (BH v IO)
485+#endif
469486 )
470487 => proxy v
471488 -> BH v IO ()
@@ -476,7 +493,9 @@ dropESSchema prx = void $ deleteIndex prx (toIndexName prx "katip-elasticsearch-
476493dropESSTemplate
477494 :: ( TestESVersion v
478495 , Monad (BH v IO)
496+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 800
479497 , Functor (BH v IO)
498+#endif
480499 )
481500 => proxy v
482501 -> BH v IO ()