Skip to content

nit-picks. #2965

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
fisx merged 1 commit into from
Jan 10, 2023
Merged

nit-picks. #2965

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ endif
.PHONY: clean
clean:
cabal clean
$(MAKE) -C services/nginz clean
-rm -rf dist

.PHONY: clean-hint
Expand Down
1 change: 1 addition & 0 deletions changelog.d/5-internal/pr-2965
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix `make clean`; allow new data constructors in `ToSchema Version` instance
6 changes: 1 addition & 5 deletions libs/wire-api/src/Wire/API/Routes/Version.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@ data Version = V0 | V1 | V2 | V3
instance ToSchema Version where
schema =
enum @Integer "Version" . mconcat $
[ element 0 V0,
element 1 V1,
element 2 V2,
element 3 V3
]
(\v -> element (fromIntegral $ fromEnum v) v) <$> [minBound @Version ..]

mkVersion :: Integer -> Maybe Version
mkVersion n = case Aeson.fromJSON (Aeson.Number (fromIntegral n)) of
Expand Down