lock => the lock in solver failure messages

lib/hex/solver.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver do
   _ = """
@@ -51,8 +51,12 @@ defmodule Hex.Solver do
           {:ok, result()} | {:error, String.t()}
   def run(registry, dependencies, locked, overrides, opts \\ []) do
     case Solver.run(registry, dependencies, locked, overrides) do
-      {:ok, solution} -> {:ok, Map.drop(solution, ["$root", "$lock"])}
-      {:error, incompatibility} -> {:error, Failure.write(incompatibility, opts)}
+      {:ok, solution} ->
+        {:ok, Map.drop(solution, ["$root", "$lock"])}
+
+      {:error, incompatibility} ->
+        IO.inspect(incompatibility)
+        {:error, Failure.write(incompatibility, opts)}
     end
   end
 

lib/hex/solver/assignment.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Assignment do
   @moduledoc false

lib/hex/solver/constraint.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defprotocol Hex.Solver.Constraint do
   @moduledoc false

lib/hex/solver/constraints/empty.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Constraints.Empty do
   @moduledoc false

lib/hex/solver/constraints/impl.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Constraints.Impl do
   @moduledoc false

lib/hex/solver/constraints/range.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Constraints.Range do
   @moduledoc false

lib/hex/solver/constraints/union.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Constraints.Union do
   @moduledoc false

lib/hex/solver/constraints/util.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Constraints.Util do
   @moduledoc false

lib/hex/solver/constraints/version.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Constraints.Version do
   @moduledoc false

lib/hex/solver/failure.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Failure do
   @moduledoc false

lib/hex/solver/incompatibility.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Incompatibility do
   @moduledoc false
@@ -59,7 +59,7 @@ defmodule Hex.Solver.Incompatibility do
         },
         opts
       ) do
-    "\"lock\" specifies #{bright_term_abs(dependee, opts)}"
+    "\"the lock\" specifies #{bright_term_abs(dependee, opts)}"
   end
 
   def to_string(
@@ -379,7 +379,7 @@ defmodule Hex.Solver.Incompatibility do
     do: bright("your app", opts)
 
   defp package_name(%Term{package_range: %PackageRange{name: "$lock"}}, opts),
-    do: bright("lock", opts)
+    do: bright("the lock", opts)
 
   defp package_name(%Term{package_range: %PackageRange{repo: nil, name: name}}, opts),
     do: bright(name, opts)
@@ -399,7 +399,7 @@ defmodule Hex.Solver.Incompatibility do
     do: bright("your app", opts)
 
   defp terse_every(%Term{package_range: %PackageRange{name: "$lock"}}, opts),
-    do: bright("lock", opts)
+    do: bright("the lock", opts)
 
   defp terse_every(term, opts) do
     if Constraint.any?(term.package_range.constraint) do

lib/hex/solver/package_lister.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.PackageLister do
   @moduledoc false

lib/hex/solver/package_range.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.PackageRange do
   @moduledoc false
@@ -11,7 +11,7 @@ defmodule Hex.Solver.PackageRange do
             constraint: nil
 
   def to_string(%PackageRange{name: "$root"}), do: "your app"
-  def to_string(%PackageRange{name: "$lock"}), do: "lock"
+  def to_string(%PackageRange{name: "$lock"}), do: "the lock"
 
   def to_string(%PackageRange{repo: nil, name: name, constraint: constraint}),
     do: "#{name}#{constraint(constraint)}"

lib/hex/solver/partial_solution.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.PartialSolution do
   @moduledoc false

lib/hex/solver/registry.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Registry do
   _ = """

lib/hex/solver/requirement.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Requirement do
   @moduledoc false

lib/hex/solver/solver.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Solver do
   @moduledoc false

lib/hex/solver/term.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Term do
   @moduledoc false

lib/hex/solver/util.ex

@@ -1,4 +1,4 @@
-# Vendored from hex_solver v0.2.0 (c71c22f), do not edit manually
+# Vendored from hex_solver v0.2.0 (b0424d1), do not edit manually
 
 defmodule Hex.Solver.Util do
   @moduledoc false

test/hex/solver_test.exs

@@ -130,14 +130,14 @@ defmodule Hex.SolverTest do
 
   test "failure due to locked dep" do
     assert solve([ex_plex: "0.1.0", decimal: nil], decimal: "0.0.1") == """
-           Because "lock" specifies "decimal 0.0.1" and "ex_plex >= 0.1.0 and < 0.2.0" depends on "decimal ~> 0.1.0", "lock" is incompatible with "ex_plex >= 0.1.0 and < 0.2.0".
-           And because "your app" depends on "lock", "ex_plex >= 0.1.0 and < 0.2.0" is forbidden.
+           Because "the lock" specifies "decimal 0.0.1" and "ex_plex >= 0.1.0 and < 0.2.0" depends on "decimal ~> 0.1.0", "the lock" is incompatible with "ex_plex >= 0.1.0 and < 0.2.0".
+           And because "your app" depends on "the lock", "ex_plex >= 0.1.0 and < 0.2.0" is forbidden.
            So, because "your app" depends on "ex_plex 0.1.0", version solving failed.\
            """
 
     assert solve([decimal: nil, ex_plex: "0.1.0"], decimal: "0.0.1") == """
-           Because "lock" specifies "decimal 0.0.1" and "ex_plex >= 0.1.0 and < 0.2.0" depends on "decimal ~> 0.1.0", "lock" is incompatible with "ex_plex >= 0.1.0 and < 0.2.0".
-           And because "your app" depends on "lock", "ex_plex >= 0.1.0 and < 0.2.0" is forbidden.
+           Because "the lock" specifies "decimal 0.0.1" and "ex_plex >= 0.1.0 and < 0.2.0" depends on "decimal ~> 0.1.0", "the lock" is incompatible with "ex_plex >= 0.1.0 and < 0.2.0".
+           And because "your app" depends on "the lock", "ex_plex >= 0.1.0 and < 0.2.0" is forbidden.
            So, because "your app" depends on "ex_plex 0.1.0", version solving failed.\
            """