all: deprecate wrapper packages

People should in general be using the upstream packages
rather than these. Also use the upstream packages directly
when possible and remove some tests that aren't testing
code in this module any more.

cmd/txtar-addmod/addmod.go

@@ -28,8 +28,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/rogpeppe/go-internal/module"
-	"github.com/rogpeppe/go-internal/txtar"
+	"golang.org/x/mod/module"
+	"golang.org/x/tools/txtar"
 )
 
 func usage() {
@@ -123,7 +123,7 @@ func main1() int {
 		}
 		path, vers, dir := f[0], f[1], f[2]
 
-		encpath, err := module.EncodePath(path)
+		encpath, err := module.EscapePath(path)
 		if err != nil {
 			log.Printf("failed to encode path %q: %v", path, err)
 			continue

cmd/txtar-c/savedir.go

@@ -8,7 +8,7 @@
 //
 //	txtar-c /path/to/dir >saved.txtar
 //
-// See https://godoc.org/github.com/rogpeppe/go-internal/txtar for details of the format
+// See https://godoc.org/golang.org/x/tools/txtar for details of the format
 // and how to parse a txtar file.
 package main
 

cmd/txtar-x/extract.go

@@ -8,7 +8,7 @@
 //
 //	txtar-x [-C root-dir] saved.txt
 //
-// See https://godoc.org/github.com/rogpeppe/go-internal/txtar for details of the format
+// See https://godoc.org/golang.org/x/tools/txtar for details of the format
 // and how to parse a txtar file.
 package main
 

diff/diff_test.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/rogpeppe/go-internal/txtar"
+	"golang.org/x/tools/txtar"
 )
 
 func clean(text []byte) []byte {

goproxytest/proxy.go

@@ -34,10 +34,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/rogpeppe/go-internal/module"
+	"golang.org/x/mod/module"
+	"golang.org/x/mod/semver"
+	"golang.org/x/tools/txtar"
+
 	"github.com/rogpeppe/go-internal/par"
-	"github.com/rogpeppe/go-internal/semver"
-	"github.com/rogpeppe/go-internal/txtar"
 )
 
 type Server struct {
@@ -110,12 +111,12 @@ func (srv *Server) readModList() error {
 			continue
 		}
 		encPath := strings.Replace(name[:i], "_", "/", -1)
-		path, err := module.DecodePath(encPath)
+		path, err := module.UnescapePath(encPath)
 		if err != nil {
 			return fmt.Errorf("cannot decode module path in %q: %v", name, err)
 		}
 		encVers := name[i+1:]
-		vers, err := module.DecodeVersion(encVers)
+		vers, err := module.UnescapeVersion(encVers)
 		if err != nil {
 			return fmt.Errorf("cannot decode module version in %q: %v", name, err)
 		}
@@ -138,7 +139,7 @@ func (srv *Server) handler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	enc, file := path[:i], path[i+len("/@v/"):]
-	path, err := module.DecodePath(enc)
+	path, err := module.UnescapePath(enc)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "go proxy_test: %v\n", err)
 		http.NotFound(w, r)
@@ -166,7 +167,7 @@ func (srv *Server) handler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	encVers, ext := file[:i], file[i+1:]
-	vers, err := module.DecodeVersion(encVers)
+	vers, err := module.UnescapeVersion(encVers)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "go proxy_test: %v\n", err)
 		http.NotFound(w, r)
@@ -274,12 +275,12 @@ func (srv *Server) findHash(m module.Version) string {
 }
 
 func (srv *Server) readArchive(path, vers string) *txtar.Archive {
-	enc, err := module.EncodePath(path)
+	enc, err := module.EscapePath(path)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "go proxy: %v\n", err)
 		return nil
 	}
-	encVers, err := module.EncodeVersion(vers)
+	encVers, err := module.EscapeVersion(vers)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "go proxy: %v\n", err)
 		return nil

goproxytest/pseudo.go

@@ -8,7 +8,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/rogpeppe/go-internal/semver"
+	"golang.org/x/mod/semver"
 )
 
 // This code was taken from cmd/go/internal/modfetch/pseudo.go

modfile/forward.go

@@ -4,6 +4,8 @@
 // apart from the ParseGopkgIn function which doesn't exist there.
 //
 // See that package for documentation.
+//
+// Deprecated: use [golang.org/x/mod/modfile] instead.
 package modfile
 
 import (