Use efficient implementation of concat_map

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
ocaml · Sep 26, 2021 · 985cb40 · 985cb40
1 parent 8902351
commit 985cb40
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/otherlibs/stdune-unstable/list.ml b/otherlibs/stdune-unstable/list.ml
@@ -37,7 +37,7 @@ let filteri l ~f =
   in
   filteri l 0
 
-let concat_map l ~f = concat (map l ~f)
+let concat_map t ~f = ListLabels.concat_map t ~f
 
 let unordered_concat =
   let rec outer acc = function

diff --git a/test/blackbox-tests/test-cases/duplicate-c-cxx-obj.t/run.t b/test/blackbox-tests/test-cases/duplicate-c-cxx-obj.t/run.t
@@ -9,11 +9,11 @@ stubs names, things are still broken if their .o files overlap:
 
   $ dune build --root diff-stanza @all 2>&1 | dune_cmd sanitize
   Entering directory 'diff-stanza'
-  File "dune", line 9, characters 12-15:
-  9 |  (cxx_names foo))
-                  ^^^
+  File "dune", line 4, characters 10-13:
+  4 |  (c_names foo))
+                ^^^
   Error: Multiple definitions for the same object file "foo$ext_obj". See another
-  definition at dune:4.
+  definition at dune:9.
   Hint: You can avoid the name clash by renaming one of the objects, or by
   placing it into a different directory.
 

diff --git a/test/blackbox-tests/test-cases/duplicate-c-cxx.t/run.t b/test/blackbox-tests/test-cases/duplicate-c-cxx.t/run.t
@@ -16,10 +16,10 @@ c_names and cxx_names with overlapping names in the same stanza
 c_names with overlapping names in different stanzas
   $ dune build --root diff-stanza @all 2>&1 | dune_cmd sanitize
   Entering directory 'diff-stanza'
-  File "dune", line 9, characters 10-13:
-  9 |  (c_names foo))
+  File "dune", line 4, characters 10-13:
+  4 |  (c_names foo))
                 ^^^
   Error: Multiple definitions for the same object file "foo$ext_obj". See another
-  definition at dune:4.
+  definition at dune:9.
   Hint: You can avoid the name clash by renaming one of the objects, or by
   placing it into a different directory.