Skip to content

fix(melange): handle include_subdirs unqualified#6475

Merged
rgrinberg merged 1 commit intomainfrom
ps/rr/fix_melange___handle_include_subdirs_unqualified
Nov 15, 2022
Merged

fix(melange): handle include_subdirs unqualified#6475
rgrinberg merged 1 commit intomainfrom
ps/rr/fix_melange___handle_include_subdirs_unqualified

Conversation

@rgrinberg
Copy link
Copy Markdown
Member

forbid [(melange.emit ..)] from appearing under [(include_subdirs
unqualified)]

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

ps-id: 5e380e59-4bf5-4847-9344-07db138b8f60

forbid [(melange.emit ..)] from appearing under [(include_subdirs
unqualified)]

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

ps-id: 5e380e59-4bf5-4847-9344-07db138b8f60
@rgrinberg rgrinberg requested a review from jchavarri November 15, 2022 05:54
@rgrinberg
Copy link
Copy Markdown
Member Author

cc @Alizter b/c coq.theory needs a similar fix.

@rgrinberg rgrinberg merged commit b23dbd4 into main Nov 15, 2022
jchavarri added a commit to jchavarri/dune that referenced this pull request Nov 16, 2022
* main:
  test(melange): demonstrate error in melange compilation trying to build @ALL (ocaml#6485)
  chore(nix): make it faster to get melange (ocaml#6347)
  refactor: status db style tweaks (ocaml#6478)
  fix: improve error message for status db (ocaml#6479)
  refactor: remove unused [flags] parameter (ocaml#6480)
  refactor(ctypes): remove pesky aliases (ocaml#6482)
  chore: tweak `hacking.rst` following `dune.exe` move to _boot (ocaml#6484)
  feature(coq): automatic detection of native
  chore(coq): bump Coq lang to 0.7
  test: disable formatting for a single dune file (ocaml#6465)
  refactor: clean up module compilation (ocaml#6461)
  doc: add button to copy code blocks in Dune manual (ocaml#6428)
  refactor: deforest a set conversion (ocaml#6473)
  refactor: remove temporary map used for sorting (ocaml#6472)
  fix(melange): handle include_subdirs unqualified (ocaml#6475)
jchavarri added a commit to jchavarri/dune that referenced this pull request Nov 16, 2022
* main:
  test(melange): demonstrate error in melange compilation trying to build @ALL (ocaml#6485)
  chore(nix): make it faster to get melange (ocaml#6347)
  refactor: status db style tweaks (ocaml#6478)
  fix: improve error message for status db (ocaml#6479)
  refactor: remove unused [flags] parameter (ocaml#6480)
  refactor(ctypes): remove pesky aliases (ocaml#6482)
  chore: tweak `hacking.rst` following `dune.exe` move to _boot (ocaml#6484)
  feature(coq): automatic detection of native
  chore(coq): bump Coq lang to 0.7
  test: disable formatting for a single dune file (ocaml#6465)
  refactor: clean up module compilation (ocaml#6461)
  doc: add button to copy code blocks in Dune manual (ocaml#6428)
  refactor: deforest a set conversion (ocaml#6473)
  refactor: remove temporary map used for sorting (ocaml#6472)
  fix(melange): handle include_subdirs unqualified (ocaml#6475)
@Alizter Alizter deleted the ps/rr/fix_melange___handle_include_subdirs_unqualified 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