diff options
author | 2014-10-22 17:14:38 -0400 | |
---|---|---|
committer | 2014-10-22 17:14:38 -0400 | |
commit | 33e7dd2e0b756270cb51d1ed574cbe4b8173c7cd (patch) | |
tree | 0e9ff04c04c33cd1ba45171983d1b9f4d92cac60 /standalone/no-th/haskell-patches/optparse-applicative_remove-ANN.patch | |
parent | 2d7b57270e628994483495159d2be715c8f9531b (diff) | |
parent | 49475bb89542e92c6f466425f29cd0640a8e80f4 (diff) |
Merge branch 'master' into s3-aws
Conflicts:
Remote/S3.hs
Diffstat (limited to 'standalone/no-th/haskell-patches/optparse-applicative_remove-ANN.patch')
-rw-r--r-- | standalone/no-th/haskell-patches/optparse-applicative_remove-ANN.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/standalone/no-th/haskell-patches/optparse-applicative_remove-ANN.patch b/standalone/no-th/haskell-patches/optparse-applicative_remove-ANN.patch new file mode 100644 index 000000000..1bb843524 --- /dev/null +++ b/standalone/no-th/haskell-patches/optparse-applicative_remove-ANN.patch @@ -0,0 +1,33 @@ +From b128590966d4946219e45e2efd88acf7a354abc2 Mon Sep 17 00:00:00 2001 +From: androidbuilder <androidbuilder@example.com> +Date: Tue, 14 Oct 2014 02:28:02 +0000 +Subject: [PATCH] remove ANN + +--- + Options/Applicative.hs | 2 -- + Options/Applicative/Help/Core.hs | 2 -- + 2 files changed, 4 deletions(-) + +diff --git a/Options/Applicative.hs b/Options/Applicative.hs +index bd4129d..f412062 100644 +--- a/Options/Applicative.hs ++++ b/Options/Applicative.hs +@@ -34,5 +34,3 @@ import Options.Applicative.Common + import Options.Applicative.Builder + import Options.Applicative.Builder.Completer + import Options.Applicative.Extra +- +-{-# ANN module "HLint: ignore Use import/export shortcut" #-} +diff --git a/Options/Applicative/Help/Core.hs b/Options/Applicative/Help/Core.hs +index 0a79169..3f1ce3f 100644 +--- a/Options/Applicative/Help/Core.hs ++++ b/Options/Applicative/Help/Core.hs +@@ -139,5 +139,3 @@ parserUsage pprefs p progn = hsep + [ string "Usage:" + , string progn + , align (extractChunk (briefDesc pprefs p)) ] +- +-{-# ANN footerHelp "HLint: ignore Eta reduce" #-} +-- +1.7.10.4 + |