Skip to content

Commit 5efe1c5

Browse files
author
Patrick Thomson
committed
Merge remote-tracking branch 'origin/master' into direct-codegen
2 parents 99e6352 + 7e0ce87 commit 5efe1c5

File tree

7 files changed

+1005
-27
lines changed

7 files changed

+1005
-27
lines changed

semantic-proto/BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ load(
1414
haskell_library(
1515
name = "semantic-proto",
1616
srcs = glob(["src/**/*.hs"]),
17+
compiler_flags = ["-XOverloadedStrings"],
1718
deps = [
1819
"//:base",
1920
"//:text",
20-
"@stackage//:proto-lens-jsonpb",
2121
"@stackage//:aeson",
2222
"@stackage//:proto-lens",
23+
"@stackage//:proto-lens-jsonpb",
2324
"@stackage//:proto-lens-runtime",
2425
],
2526
)

semantic-proto/semantic-proto.cabal

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ library
3232
, proto-lens-runtime >= 0.5 && <0.8
3333
hs-source-dirs: src
3434
default-language: Haskell2010
35+
default-extensions: OverloadedStrings
3536
ghc-options:
3637
-Weverything
3738
-Wno-missing-local-signatures
@@ -41,9 +42,11 @@ library
4142
-Wno-unsafe
4243
-Wno-name-shadowing
4344
-Wno-monomorphism-restriction
45+
-Wno-missing-export-lists
4446
-Wno-missed-specialisations
4547
-Wno-all-missed-specialisations
4648
-Wno-star-is-type
49+
-Wno-missing-export-lists
4750
if (impl(ghc >= 8.8))
4851
ghc-options: -Wno-missing-deriving-strategies
4952
if (impl(ghc >= 8.10))

0 commit comments

Comments
 (0)