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.

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

refactor: simplify merlin #6508

Merged
merged 1 commit into from
Nov 23, 2022
Merged

refactor: simplify merlin #6508

merged 1 commit into from
Nov 23, 2022

Conversation

rgrinberg
Copy link
Member

Signed-off-by: Rudi Grinberg me@rgrinberg.com

ps-id: 9629267c-bc9b-45d0-b88b-4d1008c0229d

@rgrinberg rgrinberg force-pushed the ps/rr/refactor__simplify_merlin branch 7 times, most recently from e4bc600 to 54a6031 Compare November 19, 2022 05:12
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

ps-id: 9629267c-bc9b-45d0-b88b-4d1008c0229d
@rgrinberg rgrinberg force-pushed the ps/rr/refactor__simplify_merlin branch from 54a6031 to a41b29c Compare November 22, 2022 23:41
Copy link
Collaborator

@voodoos voodoos left a comment

Choose a reason for hiding this comment

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

LGTM

@rgrinberg rgrinberg merged commit 557a001 into main Nov 23, 2022
jchavarri added a commit to jchavarri/dune that referenced this pull request Nov 24, 2022
* main: (58 commits)
  test: formatting of alternative dune files (ocaml#6567)
  refactor: remove Modules.is_empty (ocaml#6564)
  refactor: module kinds (ocaml#6562)
  refactor(coq): resolve lack of coqc properly
  Cache file contents in action builder by name. (ocaml#6555)
  fix: re-enable dune on older macos sdk's (ocaml#6515)
  fix: do not hide lib interface module (ocaml#6549)
  test: remove pkg-config output for reproducibility (ocaml#6543)
  melange: add test for ocaml flags (ocaml#6548)
  fix: improve virtual library error messages
  test: virtual library and impl locations
  test: alias module regression (ocaml#6544)
  refactor(merlin): dump config sub command (ocaml#6547)
  refactor: simplify merlin (ocaml#6508)
  chore(nix): use nix-overlays for the slim devShell (ocaml#6546)
  fix: module compilation rule env (ocaml#6527)
  chore: update nix (ocaml#6536)
  fix: merlin rules with pp's (ocaml#6474)
  Call [Dune_util.Log.init] as soon as possible (ocaml#6542)
  refactor: speed up stdlib build (ocaml#6524)
  ...
@Alizter Alizter deleted the ps/rr/refactor__simplify_merlin branch November 26, 2022 14:46
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