Remove command name patch

Author: emillon

test/blackbox-tests/test-cases/cmdline/profile.t

@@ -1,7 +1,7 @@
 # Bug #4632
 
   $ dune build -p
-  dune build: option '-p' needs an argument
+  dune: option '-p' needs an argument
   Usage: dune build [OPTION]… [TARGET]…
   Try 'dune build --help' or 'dune --help' for more information.
   [1]

test/blackbox-tests/test-cases/cmdliner-dep-conf.t/run.t

@@ -14,13 +14,13 @@
   [1]
 
   $ dune build "(fi"
-  dune build: TARGET… arguments: unclosed parenthesis at end of input
+  dune: TARGET… arguments: unclosed parenthesis at end of input
   Usage: dune build [OPTION]… [TARGET]…
   Try 'dune build --help' or 'dune --help' for more information.
   [1]
 
   $ dune build "()"
-  dune build: TARGET… arguments: Unexpected list
+  dune: TARGET… arguments: Unexpected list
   Usage: dune build [OPTION]… [TARGET]…
   Try 'dune build --help' or 'dune --help' for more information.
   [1]

test/blackbox-tests/test-cases/describe.t

@@ -1323,10 +1323,10 @@ Test errors
   [1]
 
   $ dune describe --lang 1.0
-  dune describe: Only --lang 0.1 is available at the moment as this command is not yet
-                 stabilised. If you would like to release a software that relies on the output
-                 of 'dune describe', please open a ticket on
-                 https://github.com/ocaml/dune.
+  dune: Only --lang 0.1 is available at the moment as this command is not yet
+        stabilised. If you would like to release a software that relies on the output
+        of 'dune describe', please open a ticket on
+        https://github.com/ocaml/dune.
   Usage: dune describe [OPTION]… [STRING]…
   Try 'dune describe --help' or 'dune --help' for more information.
   [1]

test/blackbox-tests/test-cases/dune-init.t/run.t

@@ -251,11 +251,10 @@ Comments in dune files are preserved
 Will not create components with invalid names
 
   $ dune init lib invalid-component-name ./_test_lib
-  dune init: NAME argument: invalid component name
-             `invalid-component-name'
-             Library names must be non-empty and composed only of the
-             following
-             characters: 'A'..'Z', 'a'..'z', '_' or '0'..'9'.
+  dune: NAME argument: invalid component name `invalid-component-name'
+        Library names must be non-empty and composed only of the
+        following
+        characters: 'A'..'Z', 'a'..'z', '_' or '0'..'9'.
   Usage: dune init [OPTION]… COMPONENT NAME [PATH]
   Try 'dune init --help' or 'dune --help' for more information.
   [1]
@@ -265,8 +264,8 @@ Will not create components with invalid names
 Will fail and inform user when invalid component command is given
 
   $ dune init foo blah
-  dune init: COMPONENT argument: invalid value 'foo', expected one of
-             'executable', 'library', 'project' or 'test'
+  dune: COMPONENT argument: invalid value 'foo', expected one of 'executable',
+        'library', 'project' or 'test'
   Usage: dune init [OPTION]… COMPONENT NAME [PATH]
   Try 'dune init --help' or 'dune --help' for more information.
   [1]

test/blackbox-tests/test-cases/external-lib-deps.t

@@ -1,5 +1,5 @@
 external-lib-deps is no more.
 
   $ dune external-lib-deps
-  dune external-lib-deps: This subcommand is no longer implemented.
+  dune: This subcommand is no longer implemented.
   [1]

test/blackbox-tests/test-cases/github3046.t

@@ -7,29 +7,28 @@ are given as parameters
 `dune init exe main --libs="str gsl"` returns an informative parsing error
 
   $ dune init exe main --libs="str gsl"
-  dune init: option '--libs': invalid element in list ('str gsl'): expected a
-             valid dune atom
+  dune: option '--libs': invalid element in list ('str gsl'): expected a valid
+        dune atom
   Usage: dune init [OPTION]… COMPONENT NAME [PATH]
   Try 'dune init --help' or 'dune --help' for more information.
   [1]
 
 `dune init lib foo --ppx="foo bar"` returns an informative parsing error
 
   $ dune init lib foo --ppx="foo bar"
-  dune init: option '--ppx': invalid element in list ('foo bar'): expected a
-             valid dune atom
+  dune: option '--ppx': invalid element in list ('foo bar'): expected a valid
+        dune atom
   Usage: dune init [OPTION]… COMPONENT NAME [PATH]
   Try 'dune init --help' or 'dune --help' for more information.
   [1]
 
 `dune init lib foo --public="some/invalid&name!"` returns an informative parsing error
 
   $ dune init lib foo --public="some/invalid&name!"
-  dune init: option '--public': invalid component name
-             `some/invalid&name!'
-             Library names must be non-empty and composed only of the
-             following
-             characters: 'A'..'Z', 'a'..'z', '_' or '0'..'9'.
+  dune: option '--public': invalid component name `some/invalid&name!'
+        Library names must be non-empty and composed only of the
+        following
+        characters: 'A'..'Z', 'a'..'z', '_' or '0'..'9'.
   Usage: dune init [OPTION]… COMPONENT NAME [PATH]
   Try 'dune init --help' or 'dune --help' for more information.
   [1]

test/blackbox-tests/test-cases/github3530.t

@@ -2,15 +2,15 @@ When an empty string is passed to `-p`, we get a nice error message.
 
   $ echo '(lang dune 2.0)' > dune-project
   $ dune build -p ''
-  dune build: option '--only-packages': Invalid package name: ""
+  dune: option '--only-packages': Invalid package name: ""
   Usage: dune build [OPTION]… [TARGET]…
   Try 'dune build --help' or 'dune --help' for more information.
   [1]
 
 This can happen in a list as well:
 
   $ dune build -p 'a,b,'
-  dune build: option '--only-packages': Invalid package name: ""
+  dune: option '--only-packages': Invalid package name: ""
   Usage: dune build [OPTION]… [TARGET]…
   Try 'dune build --help' or 'dune --help' for more information.
   [1]

test/blackbox-tests/test-cases/misc.t/run.t

@@ -6,37 +6,37 @@ Test that incompatible options are properly reported
 ----------------------------------------------------
 
   $ dune build --verbose --display quiet
-  dune build: Cannot use --verbose and --display simultaneously
+  dune: Cannot use --verbose and --display simultaneously
   Usage: dune build [OPTION]… [TARGET]…
   Try 'dune build --help' or 'dune --help' for more information.
   [1]
 
   $ dune build -p toto --root .
-  dune build: option '--root' cannot be repeated
+  dune: option '--root' cannot be repeated
   Usage: dune build [OPTION]… [TARGET]…
   Try 'dune build --help' or 'dune --help' for more information.
   [1]
 
   $ dune build --for-release-of-packages toto --root .
-  dune build: option '--root' cannot be repeated
+  dune: option '--root' cannot be repeated
   Usage: dune build [OPTION]… [TARGET]…
   Try 'dune build --help' or 'dune --help' for more information.
   [1]
 
   $ dune build --no-config --config x
-  dune build: Cannot use --config and --no-config simultaneously
+  dune: Cannot use --config and --no-config simultaneously
   Usage: dune build [OPTION]… [TARGET]…
   Try 'dune build --help' or 'dune --help' for more information.
   [1]
 
   $ dune build -p toto --release
-  dune build: option '--root' cannot be repeated
+  dune: option '--root' cannot be repeated
   Usage: dune build [OPTION]… [TARGET]…
   Try 'dune build --help' or 'dune --help' for more information.
   [1]
 
   $ dune build --release --root .
-  dune build: option '--root' cannot be repeated
+  dune: option '--root' cannot be repeated
   Usage: dune build [OPTION]… [TARGET]…
   Try 'dune build --help' or 'dune --help' for more information.
   [1]

vendor/cmdliner/src/cmdliner_msg.ml

@@ -71,19 +71,16 @@ let err_cmd_missing ~dom =
 
 (* Other messages *)
 
-let cmds ei =
-  let rcmds = Cmdliner_info.Eval.(cmd ei :: parents ei) in
-  List.rev_map Cmdliner_info.Cmd.name rcmds
-
-let exec_name ei = String.concat " " (cmds ei)
+let exec_name ei = Cmdliner_info.Cmd.name @@ Cmdliner_info.Eval.main ei
 
 let pp_version ppf ei =
   match Cmdliner_info.Cmd.version @@ Cmdliner_info.Eval.main ei with
   | None -> assert false
   | Some v -> pp ppf "@[%a@]@." Cmdliner_base.pp_text v
 
 let pp_try_help ppf ei =
-  match cmds ei with
+  let rcmds = Cmdliner_info.Eval.(cmd ei :: parents ei) in
+  match List.rev_map Cmdliner_info.Cmd.name rcmds with
   | [] -> assert false
   | [n] -> pp ppf "@[<2>Try '%s --help' for more information.@]" n
   | n :: _ as cmds ->

vendor/update-cmdliner.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=2a903a2b833d4e58188eb5707e2a265064bf70d6
+version=e9d28b2f3d020eb14f1ae09fc53b536ec70833d5
 
 set -e -o pipefail