Merge branch 'main' into melange/extra-files

* main: (148 commits)
  refactor(rpc): remove mutable callback (ocaml#6786)
  refactor(stdune): make [Id.t] immediate (ocaml#6795)
  refactor(melange): share mode handling (ocaml#6799)
  refactor(scheduler): remove duplicate types (ocaml#6785)
  refactor: move cram stanza definition (ocaml#6800)
  fix: correctly validate argument to top-module (ocaml#6796)
  refactor: move generate_sites_module to own module (ocaml#6798)
  fix(melange): check rules (ocaml#6789)
  refactor(rpc): make [Call.to_dyn] public (ocaml#6797)
  refactor(rpc): invalid session errors (ocaml#6787)
  refactor(melange): remove js globs (ocaml#6782)
  doc: fix version indication for "dune ocaml top-module" (ocaml#6792)
  refactor: print shutdown exception (ocaml#6784)
  refactor(rpc): add [Call.to_dyn] (ocaml#6790)
  fix: do not impose no_sandboxing on ocamldep (ocaml#6749)
  refactor(melange): move stanza definition (ocaml#6775)
  fix: handle missing CLICOLOR_FORCE correctly (ocaml#6781)
  Revert --display tui (ocaml#6780)
  fix: render pending messages
  refactor(coq): inline coqc_rule
  ...

CHANGES.md

@@ -1,6 +1,31 @@
 Unreleased
 ----------
 
+- Make `dune describe workspace` return consistent dependencies for
+  executables and for libraries. By default, compile-time dependencies
+  towards PPX-rewriters are from now not taken into account (but
+  runtime dependencies always are). Compile-time dependencies towards
+  PPX-rewriters can be taken into account by providing the
+  `--with-pps` flag. (#6727, fixes #6486, @esope)
+
+- Fix binary corruption when installing or promoting in parallel (#6669, fixes
+  #6668, @edwintorok)
+
+- Fix running the RPC server on windows (#6721 fixes #6720, @rgrinberg)
+
+- Use colored output with GCC and Clang when compiling C stubs. The
+  flag `-fdiagnostics-color=always` is added to the `:standard` set of
+  flags. (#4083, @MisterDA)
+
+- Fix the parsing of decimal and hexadecimal escape literals in `dune`,
+  `dune-package`, and other dune s-expression based files (#6710, @shym)
+
+- Report an error if `dune init ...` would create a "dune" file in a location
+  which already contains a "dune" directory (#6705, @gridbugs)
+
+- Fix the parsing of alerts. They will now show up in diagnostics correctly.
+  (#6678, @rginberg)
+
 - Fix the compilation of modules generated at link time when
   `implicit_transitive_deps` is enabled (#6642, @rgrinberg)
 
@@ -33,8 +58,6 @@ Unreleased
 - Remove "Entering Directory" messages for `$ dune install`. (#6513,
   @rgrinberg)
 
-- Add CI testing with MSVC (#6540, fixes #6535, @jonahbeckford)
-
 - Fix configurator when using the MSVC compiler (#6538, fixes #6537, @nojb)
 
 - Fix missing dependencies when detecting the kind of C compiler we're using
@@ -47,8 +70,20 @@ Unreleased
   `copy#` and `copy_files#`. The old heuristic of looking for a module in
   parent directories is removed (#6594, @rgrinberg)
 
-- Fix inline tests with js_of_ocaml and whole program compilation mode enabled
-  (#6645, @hhugo)
+- Fix inline tests with *js_of_ocaml* and whole program compilation mode
+  enabled (#6645, @hhugo)
+
+- Fix *js_of_ocaml* separate compilation rules when `--enable=effects`
+  or `--enable=use-js-string` is used. (#6714, @hhugo)
+
+- Remove spurious build dir created when running `dune init proj ...` (#6707,
+  fixes #5429, @gridbugs)
+
+- Allow `--sandbox` to affect `ocamldep` invocations. Previously, they were
+  wrongly marked as incompatible (#6749, @rgrinberg)
+
+- Validate the command line arguments for `$ dune ocaml top-module`. This
+  command requires one positional argument (#6796, fixes #6793, @rgrinberg)
 
 3.6.1 (2022-11-24)
 ------------------

bench/micro/dune_bench/scheduler_bench.ml

@@ -17,7 +17,7 @@ let setup =
     (Path.set_root (Path.External.cwd ());
      Path.Build.set_build_dir (Path.Outside_build_dir.of_string "_build"))
 
-let prog = Option.value_exn (Bin.which ~path:(Env.path Env.initial) "true")
+let prog = Option.value_exn (Bin.which ~path:(Env_path.path Env.initial) "true")
 
 let run () = Process.run ~env:Env.initial Strict prog []