Skip to content
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

Jump to bottom

ocaml-decoders conversion experiment #1280

Merged
merged 9 commits into from
Feb 3, 2020
Merged

ocaml-decoders conversion experiment #1280

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
45c15a1
dependency: add decoders-yojson
glennsl Jan 1, 2020
1f9a186
initial conversioon to decoders
glennsl Jan 30, 2020
235073d
formatting
glennsl Jan 30, 2020
aa78b63
add custom obj decoder
glennsl Jan 30, 2020
d37baa9
use obj decoder instead of field and monadic bind
glennsl Jan 31, 2020
45e303b
Utility.Json -> JsonEx
glennsl Jan 31, 2020
49a00aa
add Json.rei
glennsl Jan 31, 2020
da81252
add ocaml-decoders to ThirdPartyLicenses.txt
glennsl Jan 31, 2020
853aecf
add license text
glennsl Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ThirdPartyLicenses.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ This project incorporates components from the projects listed below. The origina
25. fmt (https://github.com/dbuenzli/fmt)
26. LaserWave (https://github.com/Jaredk3nt/laserwave)
27. camlp5 (https://github.com/camlp5/camlp5)
28. ocaml-decoders (https://github.com/mattjbray/ocaml-decoders)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added ocaml-decoders, but the license is just ISC. Literally, that is the entire license text. So should I just add that to the end here, find the text of the ISC license from somewhere else, or just leave it as-is?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This in particular ought to be addressed before merging @bryphe

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, thanks for the ping @glennsl ! Definitely - sorry I missed this.

Let's just add the ISC license text (from here: https://opensource.org/licenses/ISC)

Copyright 2020 mattjbray

Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

Thanks for checking in on this!


%% FiraCode NOTICES AND INFORMATION BEGIN HERE
==============================================
Expand Down
99 changes: 78 additions & 21 deletions bench.esy.lock/index.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 43 additions & 0 deletions bench.esy.lock/opam/decoders-yojson.0.3.0/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 40 additions & 0 deletions bench.esy.lock/opam/decoders.0.3.0/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bench.esy.lock/opam/zed.2.0.4/opam → bench.esy.lock/opam/zed.2.0.5/opam
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.