Skip to content

Commit

Permalink
Remove all instances of deriving Typeable
Browse files Browse the repository at this point in the history
The derivation of Typeable has been automatic for quite a while now.

Related: xmonad/xmonad-contrib#548
  • Loading branch information
exorcist365 authored and liskin committed May 24, 2021
1 parent d72da95 commit 9e5b16e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/XMonad/Core.hs
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ newtype ScreenDetail = SD { screenRect :: Rectangle }
-- instantiated on 'XConf' and 'XState' automatically.
--
newtype X a = X (ReaderT XConf (StateT XState IO) a)
deriving (Functor, Monad, MonadFail, MonadIO, MonadState XState, MonadReader XConf, Typeable)
deriving (Functor, Monad, MonadFail, MonadIO, MonadState XState, MonadReader XConf)

instance Applicative X where
pure = return
Expand Down Expand Up @@ -383,7 +383,7 @@ instance Message Event
-- layouts) should consider handling.
data LayoutMessages = Hide -- ^ sent when a layout becomes non-visible
| ReleaseResources -- ^ sent when xmonad is exiting or restarting
deriving (Typeable, Eq)
deriving Eq

instance Message LayoutMessages

Expand Down
10 changes: 5 additions & 5 deletions src/XMonad/Layout.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
--
-- Maintainer : [email protected]
-- Stability : unstable
-- Portability : not portable, Typeable deriving, mtl, posix
-- Portability : not portable, mtl, posix
--
-- The collection of core layouts.
--
Expand All @@ -35,10 +35,10 @@ import Data.Maybe (fromMaybe)
------------------------------------------------------------------------

-- | Change the size of the master pane.
data Resize = Shrink | Expand deriving Typeable
data Resize = Shrink | Expand

-- | Increase the number of clients in the master pane.
data IncMasterN = IncMasterN !Int deriving Typeable
data IncMasterN = IncMasterN !Int

instance Message Resize
instance Message IncMasterN
Expand Down Expand Up @@ -132,7 +132,7 @@ mirrorRect (Rectangle rx ry rw rh) = Rectangle ry rx rh rw
-- Layouts that transition between other layouts

-- | Messages to change the current layout.
data ChangeLayout = FirstLayout | NextLayout deriving (Eq, Show, Typeable)
data ChangeLayout = FirstLayout | NextLayout deriving (Eq, Show)

instance Message ChangeLayout

Expand All @@ -147,7 +147,7 @@ data Choose l r a = Choose CLR (l a) (r a) deriving (Read, Show)
-- | Choose the current sub-layout (left or right) in 'Choose'.
data CLR = CL | CR deriving (Read, Show, Eq)

data NextNoWrap = NextNoWrap deriving (Eq, Show, Typeable)
data NextNoWrap = NextNoWrap deriving (Eq, Show)
instance Message NextNoWrap

-- | A small wrapper around handleMessage, as it is tedious to write
Expand Down
2 changes: 1 addition & 1 deletion src/XMonad/Operations.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
--
-- Maintainer : [email protected]
-- Stability : unstable
-- Portability : not portable, Typeable deriving, mtl, posix
-- Portability : not portable, mtl, posix
--
-- Operations.
--
Expand Down

0 comments on commit 9e5b16e

Please sign in to comment.