5d2863e · typeable/wai

git.iko.soy/typeable/wai

fix doctests when 'network-data' and 'iproute' are installed

Before the patch tests failed for me as: Network/Wai/Handler/Warp/Run.hs:22:8: Ambiguous module name ‘Data.IP’: it was found in multiple packages: network-data-0.5.3@netwo_G5ThtIF3NpS8U3d3JAsmlG iproute-1.7.0@iprou_5PoZLY0zggKF8zyZ5Xj1ys Patch explicitly import "iproute" to avoid "network-data" package for ghci/doctest run. Signed-off-by: Sergei Trofimovich <siarheit@google.com>

commit5d2863e99e226e306e1416d0078ea9ffa681d204 authorSergei Trofimovich <siarheit@google.com> dateSun 10 Apr 2016, 18:35 (11 years ago) parent8c6020e

1 file changed+4−3

compare with master

unifiedsplit

warp/Network/Wai/Handler/Warp/Run.hs+4−3

warp/Network/Wai/Handler/Warp/Run.hs+4−3

@@ -1,9 +1,10 @@

1+{-# LANGUAGE BangPatterns #-}

12{-# LANGUAGE CPP #-}

23{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE PackageImports #-}

5+{-# LANGUAGE PatternGuards #-}

36{-# LANGUAGE ScopedTypeVariables #-}

47{-# LANGUAGE TupleSections #-}

5−{-# LANGUAGE PatternGuards #-}

6−{-# LANGUAGE BangPatterns #-}

78{-# OPTIONS_GHC -fno-warn-deprecations #-}

910module Network.Wai.Handler.Warp.Run where

@@ -19,7 +20,7 @@ import Control.Monad (when, unless, void)

1920import Data.ByteString (ByteString)

2021import qualified Data.ByteString as S

2122import Data.Char (chr)

22−import Data.IP (toHostAddress, toHostAddress6)

23+import "iproute" Data.IP (toHostAddress, toHostAddress6)

2324import Data.IORef (IORef, newIORef, readIORef, writeIORef)

2425import Data.Streaming.Network (bindPortTCP)

2526import Network (sClose, Socket)