internal/semver: copy from golang.org/x/mod

rogpeppe · rogpeppe · commit a9a6965188f7 · 2023-09-26T13:14:33.000Z
All files copied from v0.6.0. This means that the CUE-related modules functionality depends only on code in this repository. For #2330. Signed-off-by: Roger Peppe <rogpeppe@gmail.com> Change-Id: I29b9de0618c5cabbb05bbbd32b2f85911e67be01 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1168634 TryBot-Result: CUEcueckoo <cueckoo@cuelang.org> Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
diff --git a/cue/load/module.go b/cue/load/module.go
@@ -12,7 +12,7 @@ import (
 	"cuelang.org/go/internal/mod/modfile"
 	"cuelang.org/go/internal/mod/module"
 	"cuelang.org/go/internal/mod/mvs"
-	"golang.org/x/mod/semver"
+	"cuelang.org/go/internal/mod/semver"
 )
 
 // loadModule loads the module file, resolves and downloads module
diff --git a/internal/mod/modfile/modfile.go b/internal/mod/modfile/modfile.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"sync"
 
-	"golang.org/x/mod/semver"
+	"cuelang.org/go/internal/mod/semver"
 
 	"cuelang.org/go/cue"
 	"cuelang.org/go/cue/cuecontext"
diff --git a/internal/mod/modregistry/client.go b/internal/mod/modregistry/client.go
@@ -26,10 +26,10 @@ import (
 
 	"cuelabs.dev/go/oci/ociregistry"
 	"cuelabs.dev/go/oci/ociregistry/ociclient"
+	"cuelang.org/go/internal/mod/semver"
 	digest "github.com/opencontainers/go-digest"
 	specs "github.com/opencontainers/image-spec/specs-go"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
-	"golang.org/x/mod/semver"
 
 	"cuelang.org/go/internal/mod/modfile"
 	"cuelang.org/go/internal/mod/module"
diff --git a/internal/mod/module/module.go b/internal/mod/module/module.go
@@ -27,7 +27,7 @@ import (
 	"sort"
 	"strings"
 
-	"golang.org/x/mod/semver"
+	"cuelang.org/go/internal/mod/semver"
 )
 
 // A Version (for clients, a module.Version) is defined by a module path and version pair.
diff --git a/internal/mod/module/path.go b/internal/mod/module/path.go
@@ -8,7 +8,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"golang.org/x/mod/semver"
+	"cuelang.org/go/internal/mod/semver"
 )
 
 // The following regular expressions come from https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pulling-manifests
diff --git a/internal/mod/module/versions.go b/internal/mod/module/versions.go
@@ -1,7 +1,7 @@
 package module
 
 import (
-	"golang.org/x/mod/semver"
+	"cuelang.org/go/internal/mod/semver"
 )
 
 // Versions implements mvs.Versions[Version].
diff --git a/internal/mod/semver/semver.go b/internal/mod/semver/semver.go
diff --git a/internal/mod/semver/semver_test.go b/internal/mod/semver/semver_test.go

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"cuelang.org/go/internal/mod/modfile"`
`13`	`13`	`"cuelang.org/go/internal/mod/module"`
`14`	`14`	`"cuelang.org/go/internal/mod/mvs"`
`15`		`- "golang.org/x/mod/semver"`
	`15`	`+ "cuelang.org/go/internal/mod/semver"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`// loadModule loads the module file, resolves and downloads module`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"sort"`
`28`	`28`	`"strings"`
`29`	`29`
`30`		`- "golang.org/x/mod/semver"`
	`30`	`+ "cuelang.org/go/internal/mod/semver"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`// A Version (for clients, a module.Version) is defined by a module path and version pair.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"unicode"`
`9`	`9`	`"unicode/utf8"`
`10`	`10`
`11`		`- "golang.org/x/mod/semver"`
	`11`	`+ "cuelang.org/go/internal/mod/semver"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// The following regular expressions come from https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pulling-manifests`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package module`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "golang.org/x/mod/semver"`
	`4`	`+ "cuelang.org/go/internal/mod/semver"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`// Versions implements mvs.Versions[Version].`