Merge pull request #1999 from TheLortex/fix-variants

Fix variants

src/lib.ml

@@ -762,6 +762,10 @@ let rec find_implementation_for db lib ~variants =
       ~f:(fun variant acc ->
         List.rev_append acc
           (Variant.Map.Multi.find available_implementations variant))
+    |> List.sort_uniq ~compare:(fun (a:Lib_info.t) (b:Lib_info.t) ->
+      match Lib_name.compare a.name b.name with
+      | Eq -> Path.compare a.src_dir b.src_dir
+      | x -> x)
     |> fun x -> match x, db.parent with
     | [], None -> Ok None
     | [], Some db -> find_implementation_for db lib ~variants

src/stdune/caml/dune_caml.ml

@@ -10,6 +10,7 @@ module Lexing   = Lexing
 module Digest   = Digest
 module StringLabels = StringLabels
 module ListLabels   = ListLabels
+module List   = List
 
 type ('a, 'error) result = ('a, 'error) Result.t =
   | Ok    of 'a

src/stdune/list.ml

@@ -111,6 +111,9 @@ let sort t ~compare =
 let stable_sort t ~compare =
   stable_sort t ~cmp:(fun a b -> Ordering.to_int (compare a b))
 
+let sort_uniq t ~compare =
+  Dune_caml.List.sort_uniq (fun a b -> Ordering.to_int (compare a b)) t
+
 let rec compare a b ~compare:f : Ordering.t =
   match a, b with
   | [], [] -> Eq

src/stdune/list.mli

@@ -41,6 +41,7 @@ val destruct_last : 'a t -> ('a list * 'a) option
 
 val        sort : 'a t -> compare:('a -> 'a -> Ordering.t) -> 'a t
 val stable_sort : 'a t -> compare:('a -> 'a -> Ordering.t) -> 'a t
+val   sort_uniq : 'a t -> compare:('a -> 'a -> Ordering.t) -> 'a t
 
 val compare : 'a t -> 'a t -> compare:('a -> 'a -> Ordering.t) -> Ordering.t
 

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

@@ -78,3 +78,7 @@ Solving variant ambiguity by specifying a concrete implementation.
   Entering directory 'variant-with-concrete-impl'
            bar alias default
   hello from lib2.default
+
+Don't fail when the same library is defined in multiple scopes.
+  $ dune build --root same-lib-in-multiple-scopes
+  Entering directory 'same-lib-in-multiple-scopes'

test/blackbox-tests/test-cases/variants/same-lib-in-multiple-scopes/dune

@@ -0,0 +1,9 @@
+(executable
+  (name exe)
+  (variants unix)
+  (libraries test))
+
+(alias
+ (name default)
+ (action
+  (run ./exe.exe)))

test/blackbox-tests/test-cases/variants/same-lib-in-multiple-scopes/dune-project

@@ -0,0 +1 @@
+(lang dune 1.9)

test/blackbox-tests/test-cases/variants/same-lib-in-multiple-scopes/test/dune-project

@@ -0,0 +1 @@
+(lang dune 1.9)

test/blackbox-tests/test-cases/variants/same-lib-in-multiple-scopes/test/unix/dune

@@ -0,0 +1,5 @@
+(library
+  (name test_unix)
+  (public_name test-unix)
+  (implements test)
+  (variant unix))

test/blackbox-tests/test-cases/variants/same-lib-in-multiple-scopes/test/virt/dune

@@ -0,0 +1,4 @@
+(library
+  (name test)
+  (public_name test)
+  (virtual_modules foo))