Merge pull request #1884 from sdboyer/discard-version-unifier

gps: Remove versionTypeUnion

Author: sdboyer

cmd/dep/testdata/harness_tests/ensure/add/desync/final/Gopkg.lock

@@ -10,7 +10,7 @@
     {
       "importpath": "github.com/sdboyer/deptestdos",
       "repository": "https://github.com/sdboyer/deptestdos",
-      "revision": "5c607206be5decd28e6263ffffdcee067266015eXXX",
+      "revision": "5c607206be5decd28e6263ffffdcee067266015e",
       "branch": "master"
     },
     {

cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.lock

@@ -169,12 +169,6 @@ func (c semverConstraint) typedString() string {
 
 func (c semverConstraint) Matches(v Version) bool {
 	switch tv := v.(type) {
-	case versionTypeUnion:
-		for _, elem := range tv {
-			if c.Matches(elem) {
-				return true
-			}
-		}
 	case semVersion:
 		return c.c.Matches(tv.sv) == nil
 	case versionPair:
@@ -194,12 +188,6 @@ func (c semverConstraint) Intersect(c2 Constraint) Constraint {
 	switch tc := c2.(type) {
 	case anyConstraint:
 		return c
-	case versionTypeUnion:
-		for _, elem := range tc {
-			if rc := c.Intersect(elem); rc != none {
-				return rc
-			}
-		}
 	case semverConstraint:
 		rc := c.c.Intersect(tc.c)
 		if !semver.IsNone(rc) {

cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/final/Gopkg.lock

@@ -697,183 +697,6 @@ func TestSemverConstraint_ImpliedCaret(t *testing.T) {
 	}
 }
 
-// Test that certain types of cross-version comparisons work when they are
-// expressed as a version union (but that others don't).
-func TestVersionUnion(t *testing.T) {
-	rev := Revision("flooboofoobooo")
-	v1 := NewBranch("master")
-	v2 := NewBranch("test")
-	v3 := NewVersion("1.0.0").Pair(rev)
-	v4 := NewVersion("1.0.1")
-	v5 := NewVersion("v2.0.5").Pair(Revision("notamatch"))
-
-	uv1 := versionTypeUnion{v1, v4, rev}
-	uv2 := versionTypeUnion{v2, v3}
-
-	if uv1.MatchesAny(none) {
-		t.Errorf("Union can't match none")
-	}
-	if none.MatchesAny(uv1) {
-		t.Errorf("Union can't match none")
-	}
-
-	if !uv1.MatchesAny(any) {
-		t.Errorf("Union must match any")
-	}
-	if !any.MatchesAny(uv1) {
-		t.Errorf("Union must match any")
-	}
-
-	// Basic matching
-	if !uv1.Matches(v4) {
-		t.Errorf("Union should match on branch to branch")
-	}
-	if !v4.Matches(uv1) {
-		t.Errorf("Union should reverse-match on branch to branch")
-	}
-
-	if !uv1.Matches(v3) {
-		t.Errorf("Union should match on rev to paired rev")
-	}
-	if !v3.Matches(uv1) {
-		t.Errorf("Union should reverse-match on rev to paired rev")
-	}
-
-	if uv1.Matches(v2) {
-		t.Errorf("Union should not match on anything in disjoint unpaired")
-	}
-	if v2.Matches(uv1) {
-		t.Errorf("Union should not reverse-match on anything in disjoint unpaired")
-	}
-
-	if uv1.Matches(v5) {
-		t.Errorf("Union should not match on anything in disjoint pair")
-	}
-	if v5.Matches(uv1) {
-		t.Errorf("Union should not reverse-match on anything in disjoint pair")
-	}
-
-	if !uv1.Matches(uv2) {
-		t.Errorf("Union should succeed on matching comparison to other union with some overlap")
-	}
-
-	// MatchesAny - repeat Matches for safety, but add more, too
-	if !uv1.MatchesAny(v4) {
-		t.Errorf("Union should match on branch to branch")
-	}
-	if !v4.MatchesAny(uv1) {
-		t.Errorf("Union should reverse-match on branch to branch")
-	}
-
-	if !uv1.MatchesAny(v3) {
-		t.Errorf("Union should match on rev to paired rev")
-	}
-	if !v3.MatchesAny(uv1) {
-		t.Errorf("Union should reverse-match on rev to paired rev")
-	}
-
-	if uv1.MatchesAny(v2) {
-		t.Errorf("Union should not match on anything in disjoint unpaired")
-	}
-	if v2.MatchesAny(uv1) {
-		t.Errorf("Union should not reverse-match on anything in disjoint unpaired")
-	}
-
-	if uv1.MatchesAny(v5) {
-		t.Errorf("Union should not match on anything in disjoint pair")
-	}
-	if v5.MatchesAny(uv1) {
-		t.Errorf("Union should not reverse-match on anything in disjoint pair")
-	}
-
-	c1, _ := NewSemverConstraint("~1.0.0")
-	c2, _ := NewSemverConstraint("~2.0.0")
-	if !uv1.MatchesAny(c1) {
-		t.Errorf("Union should have some overlap due to containing 1.0.1 version")
-	}
-	if !c1.MatchesAny(uv1) {
-		t.Errorf("Union should have some overlap due to containing 1.0.1 version")
-	}
-
-	if uv1.MatchesAny(c2) {
-		t.Errorf("Union should have no overlap with ~2.0.0 semver range")
-	}
-	if c2.MatchesAny(uv1) {
-		t.Errorf("Union should have no overlap with ~2.0.0 semver range")
-	}
-
-	if !uv1.MatchesAny(uv2) {
-		t.Errorf("Union should succeed on MatchAny against other union with some overlap")
-	}
-
-	// Intersect - repeat all previous
-	if uv1.Intersect(v4) != v4 {
-		t.Errorf("Union intersection on contained version should return that version")
-	}
-	if v4.Intersect(uv1) != v4 {
-		t.Errorf("Union reverse-intersection on contained version should return that version")
-	}
-
-	if uv1.Intersect(v3) != rev {
-		t.Errorf("Union intersection on paired version w/matching rev should return rev, got %s", uv1.Intersect(v3))
-	}
-	if v3.Intersect(uv1) != rev {
-		t.Errorf("Union reverse-intersection on paired version w/matching rev should return rev, got %s", v3.Intersect(uv1))
-	}
-
-	if uv1.Intersect(v2) != none {
-		t.Errorf("Union should not intersect with anything in disjoint unpaired")
-	}
-	if v2.Intersect(uv1) != none {
-		t.Errorf("Union should not reverse-intersect with anything in disjoint unpaired")
-	}
-
-	if uv1.Intersect(v5) != none {
-		t.Errorf("Union should not intersect with anything in disjoint pair")
-	}
-	if v5.Intersect(uv1) != none {
-		t.Errorf("Union should not reverse-intersect with anything in disjoint pair")
-	}
-
-	if uv1.Intersect(c1) != v4 {
-		t.Errorf("Union intersecting with semver range should return 1.0.1 version, got %s", uv1.Intersect(c1))
-	}
-	if c1.Intersect(uv1) != v4 {
-		t.Errorf("Union reverse-intersecting with semver range should return 1.0.1 version, got %s", c1.Intersect(uv1))
-	}
-
-	if uv1.Intersect(c2) != none {
-		t.Errorf("Union intersecting with non-overlapping semver range should return none, got %s", uv1.Intersect(c2))
-	}
-	if c2.Intersect(uv1) != none {
-		t.Errorf("Union reverse-intersecting with non-overlapping semver range should return none, got %s", uv1.Intersect(c2))
-	}
-
-	if uv1.Intersect(uv2) != rev {
-		t.Errorf("Unions should intersect down to rev, but got %s", uv1.Intersect(uv2))
-	}
-}
-
-func TestVersionUnionPanicOnType(t *testing.T) {
-	// versionTypeUnions need to panic if Type() gets called
-	defer func() {
-		if err := recover(); err == nil {
-			t.Error("versionTypeUnion did not panic on Type() call")
-		}
-	}()
-	_ = versionTypeUnion{}.Type()
-}
-
-func TestVersionUnionPanicOnString(t *testing.T) {
-	// versionStringUnions need to panic if String() gets called
-	defer func() {
-		if err := recover(); err == nil {
-			t.Error("versionStringUnion did not panic on String() call")
-		}
-	}()
-	_ = versionTypeUnion{}.String()
-}
-
 func TestTypedConstraintString(t *testing.T) {
 	// Also tests typedVersionString(), as this nests down into that
 	rev := Revision("flooboofoobooo")
@@ -944,8 +767,6 @@ func TestConstraintsIdentical(t *testing.T) {
 		{Revision("test"), Revision("test"), true},
 		{Revision("test"), Revision("test2"), false},
 		{testSemverConstraint(t, "v2.10.7"), testSemverConstraint(t, "v2.10.7"), true},
-		{versionTypeUnion{NewVersion("test"), NewBranch("branch")},
-			versionTypeUnion{NewBranch("branch"), NewVersion("test")}, true},
 	} {
 		if test.eq != test.a.identical(test.b) {
 			want := "identical"

cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.lock

@@ -80,15 +80,15 @@ func (s *solver) check(a atomWithPackages, pkgonly bool) error {
 // the constraints established by the current solution.
 func (s *solver) checkAtomAllowable(pa atom) error {
 	constraint := s.sel.getConstraint(pa.id)
-	if s.vUnify.matches(pa.id, constraint, pa.v) {
+	if constraint.Matches(pa.v) {
 		return nil
 	}
 	// TODO(sdboyer) collect constraint failure reason (wait...aren't we, below?)
 
 	deps := s.sel.getDependenciesOn(pa.id)
 	var failparent []dependency
 	for _, dep := range deps {
-		if !s.vUnify.matches(pa.id, dep.dep.Constraint, pa.v) {
+		if !dep.dep.Constraint.Matches(pa.v) {
 			s.fail(dep.depender.id)
 			failparent = append(failparent, dep)
 		}
@@ -150,7 +150,7 @@ func (s *solver) checkDepsConstraintsAllowable(a atomWithPackages, cdep complete
 	constraint := s.sel.getConstraint(dep.Ident)
 	// Ensure the constraint expressed by the dep has at least some possible
 	// intersection with the intersection of existing constraints.
-	if s.vUnify.matchesAny(dep.Ident, constraint, dep.Constraint) {
+	if constraint.MatchesAny(dep.Constraint) {
 		return nil
 	}
 
@@ -159,7 +159,7 @@ func (s *solver) checkDepsConstraintsAllowable(a atomWithPackages, cdep complete
 	var failsib []dependency
 	var nofailsib []dependency
 	for _, sibling := range siblings {
-		if !s.vUnify.matchesAny(dep.Ident, sibling.dep.Constraint, dep.Constraint) {
+		if !sibling.dep.Constraint.MatchesAny(dep.Constraint) {
 			s.fail(sibling.depender.id)
 			failsib = append(failsib, sibling)
 		} else {
@@ -181,7 +181,7 @@ func (s *solver) checkDepsConstraintsAllowable(a atomWithPackages, cdep complete
 func (s *solver) checkDepsDisallowsSelected(a atomWithPackages, cdep completeDep) error {
 	dep := cdep.workingConstraint
 	selected, exists := s.sel.selected(dep.Ident)
-	if exists && !s.vUnify.matches(dep.Ident, dep.Constraint, selected.a.v) {
+	if exists && !dep.Constraint.Matches(selected.a.v) {
 		s.fail(dep.Ident)
 
 		return &constraintNotAllowedFailure{

cmd/dep/testdata/harness_tests/ensure/update/desync/final/Gopkg.lock

@@ -16,8 +16,6 @@ type selection struct {
 	// ProjectRoots to the particular case variant that has currently been
 	// selected.
 	foldRoots map[string]ProjectRoot
-	// The versoinUnifier in use for this solve run.
-	vu *versionUnifier
 }
 
 type selected struct {
@@ -159,7 +157,7 @@ func (s *selection) getConstraint(id ProjectIdentifier) Constraint {
 	// Start with the open set
 	var ret Constraint = any
 	for _, dep := range deps {
-		ret = s.vu.intersect(id, ret, dep.dep.Constraint)
+		ret = ret.Intersect(dep.dep.Constraint)
 	}
 
 	return ret

cmd/dep/testdata/harness_tests/init/gvt/case1/initial/vendor/manifest

@@ -847,8 +847,8 @@ var basicFixtures = map[string]basicFixture{
 			"foo 1.0.1 foorev", // mkrevlock drops the 1.0.1
 		),
 		r: mksolution(
-			"foo 1.0.1 foorev",
-			"bar 1.0.1",
+			"foo 1.0.2",
+			"bar 1.0.2",
 		),
 	},
 	"lock to branch on old rev keeps old rev": {