Skip to content

Commit

Permalink
Merge pull request #42 from kallisti-dev/patch-1
Browse files Browse the repository at this point in the history
add Eq, Show, and Read instances to all data types in Data.Conduit.Network
  • Loading branch information
meteficha committed Apr 12, 2012
2 parents 25132be + b52a954 commit ef1543b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion network-conduit/Data/Conduit/Network.hs
Expand Up @@ -80,6 +80,7 @@ data ServerSettings = ServerSettings
{ serverPort :: Int { serverPort :: Int
, serverHost :: HostPreference , serverHost :: HostPreference
} }
deriving (Eq, Show, Read)


-- | Run an @Application@ with the given settings. This function will create a -- | Run an @Application@ with the given settings. This function will create a
-- new listening socket, accept connections on it, and spawn a new thread for -- new listening socket, accept connections on it, and spawn a new thread for
Expand Down Expand Up @@ -107,6 +108,7 @@ data ClientSettings = ClientSettings
{ clientPort :: Int { clientPort :: Int
, clientHost :: String , clientHost :: String
} }
deriving (Eq, Show, Read)


-- | Run an @Application@ by connecting to the specified server. -- | Run an @Application@ by connecting to the specified server.
-- --
Expand Down Expand Up @@ -151,7 +153,7 @@ data HostPreference =
| HostIPv4 | HostIPv4
| HostIPv6 | HostIPv6
| Host String | Host String
deriving (Show, Eq, Ord) deriving (Eq, Ord, Show, Read)


instance IsString HostPreference where instance IsString HostPreference where
-- The funny code coming up is to get around some irritating warnings from -- The funny code coming up is to get around some irritating warnings from
Expand Down

0 comments on commit ef1543b

Please sign in to comment.