hsimport 0.6.7 → 0.7

raw patch · 5 files changed

+16/−8 lines, 5 filesdep ~haskell-src-extsPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: haskell-src-exts

API changes (from Hackage documentation)

Files

• CHANGELOG +4/−0
• hsimport.cabal +5/−4
• lib/HsImport/ImportChange.hs +3/−3
• lib/HsImport/Utils.hs +3/−0
• tests/Main.hs +1/−1

@@ -1,3 +1,7 @@+0.7+---+* Changes for haskell-src-exts 1.17.0+ 0.6.7 ----- * More robust handling of invalid Haskell source code

@@ -1,5 +1,5 @@ name: hsimport-version: 0.6.7+version: 0.7 cabal-version: >=1.9.2 build-type: Simple license: BSD3@@ -10,7 +10,8 @@     A command line program for extending the import list of a Haskell source file. category: Utils, Development author: Daniel Trstenjak-tested-with: GHC ==7.6.2 GHC ==7.6.3 GHC ==7.8.3 GHC ==7.10.1 GHC ==7.10.2+tested-with: GHC ==7.6.2 GHC ==7.6.3 GHC ==7.8.3 GHC ==7.10.1+             GHC ==7.10.2 extra-source-files:     README.md     CHANGELOG@@ -32,7 +33,7 @@     build-depends:         base >=3 && <5,         cmdargs >=0.10.5 && <0.11,-        haskell-src-exts >=1.16.0 && <1.17,+        haskell-src-exts >=1.17.0 && <1.18,         lens >=3.9.2 && <4.14,         mtl >=2.1.2 && <2.3,         text >=0.11.3.1 && <1.3,@@ -71,7 +72,7 @@         tasty >=0.9.0.1 && <0.12,         tasty-golden >=2.2.0.1 && <2.4,         filepath >=1.3.0.1 && <1.5,-        haskell-src-exts >=1.16.0 && <1.17,+        haskell-src-exts >=1.17.0 && <1.18,         hsimport -any     hs-source-dirs: tests     ghc-options: -W

@@ -149,8 +149,8 @@    | otherwise    = False    where-      imports (Symbol symName)             (HS.IVar _ name)                  = symName == nameString name-      imports (Symbol symName)             (HS.IAbs name)                    = symName == nameString name+      imports (Symbol symName)             (HS.IVar name)                    = symName == nameString name+      imports (Symbol symName)             (HS.IAbs _ name)                  = symName == nameString name       imports (Symbol symName)             (HS.IThingAll name)               = symName == nameString name       imports (Symbol symName)             (HS.IThingWith name _)            = symName == nameString name       imports (AllOfSymbol symName)        (HS.IThingAll name)               = symName == nameString name@@ -208,7 +208,7 @@   importSpec :: Symbol -> HS.ImportSpec-importSpec (Symbol symName)             = HS.IVar HS.NoNamespace (hsName symName)+importSpec (Symbol symName)             = HS.IVar $ hsName symName importSpec (AllOfSymbol symName)        = HS.IThingAll $ hsName symName importSpec (SomeOfSymbol symName names) = HS.IThingWith (hsName symName) (map (HS.VarName . hsName) names) 

@@ -32,10 +32,12 @@         HS.DefaultDecl srcLoc _             -> Just srcLoc         HS.SpliceDecl srcLoc _              -> Just srcLoc         HS.TypeSig srcLoc _ _               -> Just srcLoc+        HS.PatSynSig srcLoc _ _ _ _ _       -> Just srcLoc         HS.FunBind _                        -> Nothing         HS.PatBind srcLoc _ _ _             -> Just srcLoc         HS.ForImp srcLoc _ _ _ _ _          -> Just srcLoc         HS.ForExp srcLoc _ _ _ _            -> Just srcLoc+        HS.PatSyn srcLoc _ _ _              -> Just srcLoc         HS.RulePragmaDecl srcLoc _          -> Just srcLoc         HS.DeprPragmaDecl srcLoc _          -> Just srcLoc         HS.WarnPragmaDecl srcLoc _          -> Just srcLoc@@ -46,6 +48,7 @@         HS.InstSig srcLoc _ _ _ _           -> Just srcLoc         HS.AnnPragma srcLoc _               -> Just srcLoc         HS.MinimalPragma srcLoc _           -> Just srcLoc+        HS.RoleAnnotDecl srcLoc _ _         -> Just srcLoc   importDecls :: HS.Module -> [HS.ImportDecl]

@@ -117,7 +117,7 @@       ppSyms = intercalate " , " symNames       symNames = map symName syms -      symName (HS.IVar HS.NoNamespace (HS.Ident name)) = name+      symName (HS.IVar (HS.Ident name)) = name       symName _ = ""  prettyPrint _ = "Uupps"