From c869f9627e19aec255a6c527dcab550d4de5f8e1 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 3 Mar 2024 13:51:30 +0100 Subject: chore(users/Profpatsch): misc small improvements Change-Id: I8fc128391196da22f03bac76a6c621f2cee73334 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11084 Autosubmit: Profpatsch Reviewed-by: Profpatsch Tested-by: BuildkiteCI --- users/Profpatsch/my-webstuff/src/Multipart2.hs | 16 +++++++------- users/Profpatsch/netencode/Netencode/Parse.hs | 1 - users/Profpatsch/whatcd-resolver/build.ninja | 29 -------------------------- 3 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 users/Profpatsch/whatcd-resolver/build.ninja diff --git a/users/Profpatsch/my-webstuff/src/Multipart2.hs b/users/Profpatsch/my-webstuff/src/Multipart2.hs index 17246546ab..5c283a3c1b 100644 --- a/users/Profpatsch/my-webstuff/src/Multipart2.hs +++ b/users/Profpatsch/my-webstuff/src/Multipart2.hs @@ -108,7 +108,7 @@ parseMultipartOrThrow throwF parser req = do Success a -> pure a -- | Parse the field out of the multipart message -field :: Applicative m => ByteString -> FieldParser ByteString a -> MultipartParseT backend m a +field :: (Applicative m) => ByteString -> FieldParser ByteString a -> MultipartParseT backend m a field fieldName fieldParser = MultipartParseT $ \mp -> mp.inputs & findMaybe (\input -> if fst input == fieldName then Just (snd input) else Nothing) @@ -118,7 +118,7 @@ field fieldName fieldParser = MultipartParseT $ \mp -> & pure -- | Parse the field out of the multipart message -field' :: Applicative m => ByteString -> FieldParser ByteString a -> MultipartParseT backend m (FormValidation a) +field' :: (Applicative m) => ByteString -> FieldParser ByteString a -> MultipartParseT backend m (FormValidation a) field' fieldName fieldParser = MultipartParseT $ \mp -> mp.inputs & findMaybe (\input -> if fst input == fieldName then Just $ snd input else Nothing) @@ -136,15 +136,15 @@ field' fieldName fieldParser = MultipartParseT $ \mp -> & pure -- | Parse the field out of the multipart message, and into a 'Label' of the given name. -fieldLabel :: forall lbl backend m a. Applicative m => ByteString -> FieldParser ByteString a -> MultipartParseT backend m (Label lbl a) +fieldLabel :: forall lbl backend m a. (Applicative m) => ByteString -> FieldParser ByteString a -> MultipartParseT backend m (Label lbl a) fieldLabel fieldName fieldParser = label @lbl <$> field fieldName fieldParser -- | Parse the field out of the multipart message, and into a 'Label' of the given name. -fieldLabel' :: forall lbl backend m a. Applicative m => ByteString -> FieldParser ByteString a -> MultipartParseT backend m (FormValidation (Label lbl a)) +fieldLabel' :: forall lbl backend m a. (Applicative m) => ByteString -> FieldParser ByteString a -> MultipartParseT backend m (FormValidation (Label lbl a)) fieldLabel' fieldName fieldParser = fmap (label @lbl) <$> field' fieldName fieldParser -- | parse all fields out of the multipart message, with the same parser -allFields :: Applicative m => FieldParser (T2 "key" ByteString "value" ByteString) b -> MultipartParseT backend m [b] +allFields :: (Applicative m) => FieldParser (T2 "key" ByteString "value" ByteString) b -> MultipartParseT backend m [b] allFields fieldParser = MultipartParseT $ \mp -> mp.inputs <&> tupToT2 @"key" @"value" @@ -157,7 +157,7 @@ tupToT2 (a, b) = T2 (label a) (label b) -- | Parse a file by name out of the multipart message file :: - Applicative m => + (Applicative m) => ByteString -> MultipartParseT backend m (MultipartFile Lazy.ByteString) file fieldName = MultipartParseT $ \mp -> @@ -172,14 +172,14 @@ file fieldName = MultipartParseT $ \mp -> -- | Return all files from the multipart message allFiles :: - Applicative m => + (Applicative m) => MultipartParseT backend m [MultipartFile Lazy.ByteString] allFiles = MultipartParseT $ \mp -> do pure $ Success $ mp.files -- | Ensure there is exactly one file and return it (ignoring the field name) exactlyOneFile :: - Applicative m => + (Applicative m) => MultipartParseT backend m (MultipartFile Lazy.ByteString) exactlyOneFile = MultipartParseT $ \mp -> mp.files diff --git a/users/Profpatsch/netencode/Netencode/Parse.hs b/users/Profpatsch/netencode/Netencode/Parse.hs index e55eedf568..184fb5f912 100644 --- a/users/Profpatsch/netencode/Netencode/Parse.hs +++ b/users/Profpatsch/netencode/Netencode/Parse.hs @@ -13,7 +13,6 @@ import Data.Map.NonEmpty qualified as NEMap import Data.Semigroupoid qualified as Semigroupiod import Data.Semigroupoid qualified as Semigroupoid import Data.Text qualified as Text -import Label import Netencode qualified import PossehlAnalyticsPrelude import Prelude hiding (log) diff --git a/users/Profpatsch/whatcd-resolver/build.ninja b/users/Profpatsch/whatcd-resolver/build.ninja deleted file mode 100644 index 026f100a2e..0000000000 --- a/users/Profpatsch/whatcd-resolver/build.ninja +++ /dev/null @@ -1,29 +0,0 @@ -builddir = .ninja - -rule cabal-run - command = cabal run $target - -rule cabal-repl - command = cabal repl $target - -rule cabal-test - command = cabal test $target - -rule hpack-file - description = hpack $in - command = $ - hpack --force $in $ - && touch $out - -build repl : cabal-repl | cabal-preconditions - target = whatcd-resolver-server - pool = console - -build run : cabal-run | cabal-preconditions - target = whatcd-resolver-server - pool = console - - -build cabal-preconditions : phony whatcd-resolver-server.cabal - -build whatcd-resolver-server.cabal : hpack-file package.yaml -- cgit 1.4.1