Merge pull request #519 from rhendric/rhendric/noncanonical

Remove noncanonical definitions

Author: snoyberg

conduit/ChangeLog.md

@@ -1,5 +1,9 @@
 # ChangeLog for conduit
 
+## 1.3.6.1
+
+* Forward compatibility with `-Wnoncanonical-monad-instances` becoming an error
+
 ## 1.3.6
 
 * Avoid dropping upstream items in `mergeSource` [#513](https://github.com/snoyberg/conduit/pull/513)

conduit/conduit.cabal

@@ -1,5 +1,5 @@
 Name:                conduit
-Version:             1.3.6
+Version:             1.3.6.1
 Synopsis:            Streaming data processing library.
 description:
     `conduit` is a solution to the streaming data problem, allowing for production,

conduit/src/Data/Conduit/Internal/Conduit.hs

@@ -148,7 +148,7 @@ instance Applicative (ConduitT i o m) where
     {-# INLINE pure #-}
     (<*>) = ap
     {-# INLINE (<*>) #-}
-    (*>) = (>>)
+    x *> y = x >>= \_ -> y
     {-# INLINE (*>) #-}
 
 instance Monad (ConduitT i o m) where