Skip to content

Commit 178dcfd

Browse files
committed
Don't use the RecordWildcards trick
1 parent c64b1b7 commit 178dcfd

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

hackage-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ common defaults
125125
, vector ^>= 0.12
126126
, zlib ^>= 0.6.2
127127

128-
ghc-options: -Wall -fwarn-tabs -fno-warn-unused-do-bind -fno-warn-deprecated-flags -fwarn-incomplete-record-updates -funbox-strict-fields
128+
ghc-options: -Wall -fwarn-tabs -fno-warn-unused-do-bind -fno-warn-deprecated-flags -funbox-strict-fields
129129

130130
if impl(ghc >= 8.2)
131131
ghc-options: -Werror=incomplete-patterns -Werror=missing-methods

src/Distribution/Server/Features/Users.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ userFeature templates usersState adminsState
496496
let resp' = fromMaybe defaultResponse overrideResponse
497497
-- reset authn to "0" on auth failures
498498
resp'' = case resp' of
499-
ErrorResponse{..} -> ErrorResponse { errorHeaders = ("Set-Cookie","authn=\"0\";Path=/;Version=\"1\""):errorHeaders, .. }
499+
r@ErrorResponse{} -> r { errorHeaders = ("Set-Cookie","authn=\"0\";Path=/;Version=\"1\""):errorHeaders r }
500500
GenericErrorResponse -> GenericErrorResponse
501501
throwError resp''
502502

src/Distribution/Server/Framework/HappstackUtils.hs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{-# LANGUAGE FlexibleContexts, RecordWildCards #-}
1+
{-# LANGUAGE FlexibleContexts #-}
22
{-|
33
44
Functions and combinators to expose functioanlity buiding
@@ -172,14 +172,14 @@ enableGZip compressParams modifyETag = do
172172
where
173173
gzipFilter :: Response -> Response
174174
gzipFilter r@SendFile{} = r -- Leave files alone
175-
gzipFilter Response{..} =
175+
gzipFilter r@Response{} =
176176
chunked
177177
. setHeader "Content-Encoding" "gzip"
178178
. setHeader "Vary" "Accept-Encoding"
179179
. removeResponseHeader "Content-Length"
180180
. removeResponseHeader "Content-MD5"
181181
. alterResponseHeader "ETag" (map modifyETag)
182-
$ Response { rsBody = GZip.compressWith compressParams rsBody, .. }
182+
$ r { rsBody = GZip.compressWith compressParams $ rsBody r }
183183

184184
-- | Variation on 'enableGZip' with sensible defaults
185185
--
@@ -216,14 +216,12 @@ enableRange = do
216216
-- out the original length.
217217
rangeFilter :: (Int64, Int64) -> Response -> Response
218218
rangeFilter _ r@SendFile{} = r
219-
rangeFilter (fr, to) r@Response{..} =
219+
rangeFilter (fr, to) r@Response{} =
220220
setHeader "Content-Length" (show rangeLen)
221221
. setHeaderBS (BS.C8.pack "Content-Range") (contentRange fr to fullLen)
222222
. removeResponseHeader "Content-MD5"
223-
$ Response
224-
{ rsBody = BS.Lazy.take rangeLen $ BS.Lazy.drop fr rsBody
223+
$ r { rsBody = BS.Lazy.take rangeLen $ BS.Lazy.drop fr $ rsBody r
225224
, rsCode = 206
226-
, ..
227225
}
228226
where
229227
rangeLen = to - fr + 1

0 commit comments

Comments
 (0)