From e5b0dd6c7bf91c61b134b6db3e77c0276aa5472b Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Fri, 20 Nov 2015 11:57:01 +0100 Subject: [PATCH] Bump stylish-haskell to 1.17.0 --- CHANGELOG | 3 +++ src/Language/Haskell/Stylish/Step/Imports.hs | 4 ++-- stylish-haskell.cabal | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 586e7aba..3d05cef8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +- 0.5.14.4 + * Bump `stylish-haskell` to 1.17.0 + - 0.5.14.3 * Bump `HUnit` to 1.13 diff --git a/src/Language/Haskell/Stylish/Step/Imports.hs b/src/Language/Haskell/Stylish/Step/Imports.hs index 486fba75..b58a8e36 100644 --- a/src/Language/Haskell/Stylish/Step/Imports.hs +++ b/src/Language/Haskell/Stylish/Step/Imports.hs @@ -59,8 +59,8 @@ compareImportSpecs :: H.ImportSpec l -> H.ImportSpec l -> Ordering compareImportSpecs = comparing key where key :: H.ImportSpec l -> (Int, Int, String) - key (H.IVar _ _ x) = let n = nameToString x in (1, operator n, n) - key (H.IAbs _ x) = (0, 0, nameToString x) + key (H.IVar _ x) = let n = nameToString x in (1, operator n, n) + key (H.IAbs _ _ x) = (0, 0, nameToString x) key (H.IThingAll _ x) = (0, 0, nameToString x) key (H.IThingWith _ x _) = (0, 0, nameToString x) diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal index c96ceb11..d5ed0658 100644 --- a/stylish-haskell.cabal +++ b/stylish-haskell.cabal @@ -1,5 +1,5 @@ Name: stylish-haskell -Version: 0.5.14.3 +Version: 0.5.14.4 Synopsis: Haskell code prettifier Homepage: https://github.com/jaspervdj/stylish-haskell License: BSD3 @@ -52,7 +52,7 @@ Library containers >= 0.3 && < 0.6, directory >= 1.1 && < 1.3, filepath >= 1.1 && < 1.5, - haskell-src-exts >= 1.16 && < 1.17, + haskell-src-exts >= 1.17 && < 1.18, mtl >= 2.0 && < 2.3, syb >= 0.3 && < 0.7, yaml >= 0.7 && < 0.9 @@ -73,7 +73,7 @@ Executable stylish-haskell containers >= 0.3 && < 0.6, directory >= 1.1 && < 1.3, filepath >= 1.1 && < 1.5, - haskell-src-exts >= 1.16 && < 1.17, + haskell-src-exts >= 1.17 && < 1.18, mtl >= 2.0 && < 2.3, syb >= 0.3 && < 0.7, yaml >= 0.7 && < 0.9 @@ -106,7 +106,7 @@ Test-suite stylish-haskell-tests containers >= 0.3 && < 0.6, directory >= 1.1 && < 1.3, filepath >= 1.1 && < 1.5, - haskell-src-exts >= 1.16 && < 1.17, + haskell-src-exts >= 1.17 && < 1.18, mtl >= 2.0 && < 2.3, syb >= 0.3 && < 0.7, yaml >= 0.7 && < 0.9