diff --git a/src/Tahoe/Directory/Internal/Capability.hs b/src/Tahoe/Directory/Internal/Capability.hs index 756a367d23d95d80188734c65a0a526583dc2cb5..289eb59b3e40d31ac4fe5ce5463937cc779406ff 100644 --- a/src/Tahoe/Directory/Internal/Capability.hs +++ b/src/Tahoe/Directory/Internal/Capability.hs @@ -46,8 +46,7 @@ pVerifyCHK :: Parser (DirectoryCapability CHK.Verifier) pVerifyCHK = do s <- getInput setInput $ T.replace "URI:DIR2-CHK-Verifier:" "URI:CHK-Verifier:" s - v <- CHK.pVerifier - pure $ DirectoryCapability v + DirectoryCapability <$> CHK.pVerifier {- | Parse a CHK directory reader capability. @@ -58,8 +57,7 @@ pReadCHK :: Parser (DirectoryCapability CHK.Reader) pReadCHK = do s <- getInput setInput $ T.replace "URI:DIR2-CHK:" "URI:CHK:" s - v <- CHK.pReader - pure $ DirectoryCapability v + DirectoryCapability <$> CHK.pReader {- | Parse an SDMF directory verifier capability. As is the case for the other directory capability parsers, the implementation is cheesy. @@ -68,8 +66,7 @@ pVerifySDMF :: Parser (DirectoryCapability SDMF.Verifier) pVerifySDMF = do s <- getInput setInput $ T.replace "URI:DIR2-Verifier:" "URI:SSK-Verifier:" s - v <- SDMF.pVerifier - pure $ DirectoryCapability v + DirectoryCapability SDMF.pVerifier {- | Parse an SDMF directory reader capability. As is the case for the other directory capability parsers, the implementation is cheesy. @@ -78,8 +75,7 @@ pReadSDMF :: Parser (DirectoryCapability SDMF.Reader) pReadSDMF = do s <- getInput setInput $ T.replace "URI:DIR2-RO:" "URI:SSK-RO:" s - v <- SDMF.pReader - pure $ DirectoryCapability v + DirectoryCapability <$> SDMF.pReader {- | Parse an SDMF directory writer capability. As is the case for the other directory capability parsers, the implementation is cheesy. @@ -88,5 +84,4 @@ pWriteSDMF :: Parser (DirectoryCapability SDMF.Writer) pWriteSDMF = do s <- getInput setInput $ T.replace "URI:DIR2:" "URI:SSK:" s - v <- SDMF.pWriter - pure $ DirectoryCapability v + DirectoryCapability <$> SDMF.pWriter