Tweak the error message again

Signed-off-by: Andrey Mokhov <amokhov@janestreet.com>
ocaml · Oct 4, 2019 · dc56b0b · dc56b0b
1 parent dcb4a8b
commit dc56b0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/dune/dune_file.ml b/src/dune/dune_file.ml
@@ -652,12 +652,11 @@ module Buildable = struct
       then
         User_error.raise ~loc:loc_sbsa
           [ Pp.concat
-              [ Pp.textf "A library cannot use both "
+              [ Pp.textf "A library cannot use "
               ; Pp.hbox (Pp.textf "(self_build_stubs_archive ...)")
               ; Pp.textf " and "
-              ; Pp.hbox (Pp.textf "(foreign_stubs ...)")
-              ; Pp.textf
-                  " simultaneously. This feature will only become available in "
+              ; Pp.hbox (Pp.textf "(c_names ...)")
+              ; Pp.textf " simultaneously. This is supported starting from "
               ; Pp.hbox (Pp.textf "Dune 2.0.")
               ]
           ]

diff --git a/test/blackbox-tests/test-cases/github1306/run.t b/test/blackbox-tests/test-cases/github1306/run.t
@@ -2,7 +2,6 @@
   File "dune", line 4, characters 1-33:
   4 |  (self_build_stubs_archive (bar)))
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  Error: A library cannot use both (self_build_stubs_archive ...) and
-  (foreign_stubs ...) simultaneously. This feature will only become available
-  in Dune 2.0.
+  Error: A library cannot use (self_build_stubs_archive ...) and (c_names ...)
+  simultaneously. This is supported starting from Dune 2.0.
   [1]