Update ocp-indent to ocamlformat and replace action with rule stanza #13

shubhamkumar13 · 2021-04-12T11:11:06Z

What this PR attempts to do:

replace ocp-indent to ocamlformat (mentioned in Put a sample ocamlformat too #10)
Update the dune version to 2.8. This change generated the following error when running make.

File "test/dune", line 12, characters 1-41:
12 |  (action (run %{deps} -q --color=always)))
      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Error: 'action' was deleted in version 2.0 of the dune language. Use a rule
stanza with the alias field instead
make: *** [Makefile:8: build] Error 1

Modify the dune file in test/dune to use a rule stanza.
Add a fmt target in the Makefile to format the files using ocamlformat

…create a fmt target to format the files using ocamlformat and also update the foramtting of each file

mjambon · 2021-04-12T20:34:44Z

proj/sub2/bin/foo_main.ml

+       where SUBCOMMAND is one of:\n\
+       %s\n\n\
+       For help on a specific subcommand, try:\n\
+      \  %s SUBCOMMAND --help\n"


What's happening here with the leading backslash?

I'll let you take a look in case it's a bug with ocamlformat that needs reporting or something.

You know what, nevermind. I'll just fix it.

Sorry I didn't notice this 😅, Thanks for fixing this!

mjambon · 2021-04-12T20:36:39Z

proj/test/dune

-  test_sub1
-  test_sub2
-))
+ (libraries alcotest test_sub1 test_sub2))


I like to have one thing per line so that the diff make sense when we add/remove items later.

This was something that was auto-generated by ocamlformat and as we are going to use ocamlformat in the future I thought leaving the formatted code in would be better here

mjambon · 2021-04-12T20:41:20Z

proj/sub1/test/b.ml

+let tests =
+  [
+    ("string", `Quick, test_string); ("string, hasty", `Quick, test_string_hasty);
+  ]


I'm not a fan of this formatting style for lists but I'll get used to it.

This was autogenerated by ocamlformat :D

mjambon · 2021-04-12T20:45:54Z

proj/.ocamlinit

@@ -1,2 +0,0 @@
-#use "topfind";;
-open Printf;;


The intent of .ocamlinit was to have these commands loaded when running utop locally. Also, it's a stub letting the user know they can add their own #require ... or open directives for working with the project. Now I see opam installs a ~/.ocamlinit containing #use "topfind";;. Is this why you removed it?

Yeah I thought this file would be redundant

mjambon · 2021-04-12T20:51:24Z

Thanks a lot for the contribution! I haven't used ocamlformat just yet, so this is very much appreciated.

shubhamkumar13 added 2 commits April 9, 2021 23:13

replace ocp-indent with ocamlformat

e9a2ac4

update dune version to 2.8.0, update runtest alias to a rule stanza, …

70cc3f9

…create a fmt target to format the files using ocamlformat and also update the foramtting of each file

mjambon reviewed Apr 12, 2021

View reviewed changes

mjambon merged commit 33085fa into mjambon:master Apr 12, 2021

shubhamkumar13 mentioned this pull request Apr 13, 2021

Put a sample ocamlformat too #10

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update ocp-indent to ocamlformat and replace action with rule stanza #13

Update ocp-indent to ocamlformat and replace action with rule stanza #13

shubhamkumar13 commented Apr 12, 2021 •

edited

Loading

mjambon Apr 12, 2021

mjambon Apr 12, 2021

mjambon Apr 12, 2021

shubhamkumar13 Apr 13, 2021

mjambon Apr 12, 2021

shubhamkumar13 Apr 13, 2021 •

edited

Loading

mjambon Apr 12, 2021

shubhamkumar13 Apr 13, 2021

mjambon Apr 12, 2021

shubhamkumar13 Apr 13, 2021

mjambon commented Apr 12, 2021

Update ocp-indent to ocamlformat and replace action with rule stanza #13

Update ocp-indent to ocamlformat and replace action with rule stanza #13

Conversation

shubhamkumar13 commented Apr 12, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shubhamkumar13 Apr 13, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mjambon commented Apr 12, 2021

shubhamkumar13 commented Apr 12, 2021 •

edited

Loading

shubhamkumar13 Apr 13, 2021 •

edited

Loading