From ddaf504f3bafa717f26d4dc0cd4d16c1631acdfd Mon Sep 17 00:00:00 2001 From: Mikalai Radchuk Date: Mon, 13 Nov 2023 11:13:46 +0000 Subject: [PATCH] Replace separator in `NotSatisfiable` error Use new line instead of comma as a separator. Signed-off-by: Mikalai Radchuk --- internal/solver/solve_test.go | 4 ++-- pkg/deppy/api.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/solver/solve_test.go b/internal/solver/solve_test.go index b6c0ffa..7625a3e 100644 --- a/internal/solver/solve_test.go +++ b/internal/solver/solve_test.go @@ -65,7 +65,7 @@ func TestNotSatisfiableError(t *testing.T) { Constraint: constraint.Mandatory(), }, }, - String: fmt.Sprintf("constraints not satisfiable: %s", + String: fmt.Sprintf("constraints not satisfiable:\n%s", constraint.Mandatory().String("a")), }, { @@ -80,7 +80,7 @@ func TestNotSatisfiableError(t *testing.T) { Constraint: constraint.Prohibited(), }, }, - String: fmt.Sprintf("constraints not satisfiable: %s, %s", + String: fmt.Sprintf("constraints not satisfiable:\n%s\n%s", constraint.Mandatory().String("a"), constraint.Prohibited().String("b")), }, } { diff --git a/pkg/deppy/api.go b/pkg/deppy/api.go index 14de478..72ddcf7 100644 --- a/pkg/deppy/api.go +++ b/pkg/deppy/api.go @@ -21,7 +21,7 @@ func (e NotSatisfiable) Error() string { for i, a := range e { s[i] = a.String() } - return fmt.Sprintf("%s: %s", msg, strings.Join(s, ", ")) + return fmt.Sprintf("%s:\n%s", msg, strings.Join(s, "\n")) } // Identifier values uniquely identify particular Variables within