Skip to content

Add versioning for dune auto-formatting style#3946

Merged
nojb merged 1 commit intoocaml:masterfrom
nojb:version_dune_formatting
Nov 28, 2020
Merged

Add versioning for dune auto-formatting style#3946
nojb merged 1 commit intoocaml:masterfrom
nojb:version_dune_formatting

Conversation

@nojb
Copy link
Collaborator

@nojb nojb commented Nov 13, 2020

See #3928 (comment)

This PR adds versioning for the auto-formatting style for the dune language.

  • The format-dune-file subcommand now carries an optional flag --dune-version to specify the version wanted (note that this command is not used by dune itself, since the formatting is done in-core since Format dune files in core #3536)

  • dune describe, dune printenv and dune init use the latest version, since it seemed frivolous to add a flag to set the style version.

@nojb nojb requested a review from rgrinberg November 13, 2020 23:11
@rgrinberg
Copy link
Member

@nojb anything blocking this?

@nojb
Copy link
Collaborator Author

nojb commented Nov 27, 2020

@nojb anything blocking this?

No, I thought it was already merged :)

I'll run the tests with the current master and squash-merge it.

@nojb
Copy link
Collaborator Author

nojb commented Nov 27, 2020

The CI failure seems related to #3975 . @bobot ?

@rgrinberg
Copy link
Member

@nojb did you rebase? that stanza has been renamed

@nojb nojb force-pushed the version_dune_formatting branch from a008e64 to 900b0f5 Compare November 27, 2020 19:29
@nojb
Copy link
Collaborator Author

nojb commented Nov 27, 2020

The problem is that otherlibs/site/test/run.t needs updating.

@nojb
Copy link
Collaborator Author

nojb commented Nov 27, 2020

Done in 38e567f

@nojb nojb closed this Nov 27, 2020
@nojb nojb reopened this Nov 27, 2020
@nojb nojb merged commit bfe4dfe into ocaml:master Nov 28, 2020
@nojb nojb deleted the version_dune_formatting branch November 28, 2020 05:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants