Skip to content

Reverted back to sequence+map to avoid GHC issue when dealing with Arbitrary instances #2465

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.

Sign up for GitHub

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

Merged
elland merged 1 commit into from
Jun 9, 2022
Merged

Reverted back to sequence+map to avoid GHC issue when dealing with Arbitrary instances #2465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 24 additions & 18 deletions tools/bonanza/test/unit/Test/Bonanza/Arbitrary.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE OverloadedStrings #-}
{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}

{-# HLINT ignore "Use mapM" #-}

-- This file is part of the Wire Server implementation.
--
-- Copyright (C) 2022 Wire Swiss GmbH <opensource@wire.com>
Expand Down Expand Up @@ -365,24 +368,27 @@ instance Arbitrary (ParseInput NginzLogRecord) where
where
genFields :: Gen [(Text, CommonLogField)]
genFields =
mapM
(\(f, g) -> (f,) <$> g)
[ ("status", genIntField),
("body_bytes_sent", genIntField),
("http_referer", genStringField),
("http_user_agent", genStringField),
("http_x_forwarded_for", genIPv4Field),
("separator", genEmptyField),
("connection", genIntField),
("request_time", genDoubleField),
("upstream_response_time", genDoubleField),
("upstream_cache_status", genStringField),
("user", genStringField),
("zconn", genStringField),
("request", genStringField),
("proxy_protocol_addr", genIPv4Field),
("tracestate", genStringField)
]
-- we're disabling the linter rule here to avoid an issue from GHC
-- https://gitlab.haskell.org/ghc/ghc/-/issues/18730
sequence $
map
(\(f, g) -> (f,) <$> g)
[ ("status", genIntField),
("body_bytes_sent", genIntField),
("http_referer", genStringField),
("http_user_agent", genStringField),
("http_x_forwarded_for", genIPv4Field),
("separator", genEmptyField),
("connection", genIntField),
("request_time", genDoubleField),
("upstream_response_time", genDoubleField),
("upstream_cache_status", genStringField),
("user", genStringField),
("zconn", genStringField),
("request", genStringField),
("proxy_protocol_addr", genIPv4Field),
("tracestate", genStringField)
]
genIntField :: Gen CommonLogField
genIntField =
maybe CEmpty (CField . Number . fromIntegral . getNonNegative)
Expand Down