Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct mtl-2.3 compatibility fix that does not require CPP #54

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- os: ubuntu-latest
stack-yaml: stack.yaml
resolver: lts-19
- os: macos-latest
- os: macos-13
stack-yaml: stack.yaml
resolver: lts-19
- os: windows-latest
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
0.0.18:
* Fix compatibility with `mtl`, whenever different version from the one that is wired with ghc is used.

0.0.17:
* Changes to make compatible for GHC 9.6

Expand Down
5 changes: 1 addition & 4 deletions src/Weigh.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
{-# LANGUAGE DeriveTraversable #-}
{-# LANGUAGE DeriveFoldable #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE ExistentialQuantification #-}
{-# LANGUAGE ViewPatterns #-}
Expand Down Expand Up @@ -75,10 +74,8 @@ module Weigh
import Control.Applicative
import Control.Arrow
import Control.DeepSeq
#if MIN_VERSION_base(4,18,0)
import Control.Monad (unless)
#endif
import Control.Monad.State
import Control.Monad.State (State, execState, get, gets, modify)
import Criterion.Measurement
import qualified Data.Foldable as Foldable
import qualified Data.List as List
Expand Down
Loading