internal/mod/modzip: rename from internal/mod/zip

The name clash with archive/zip is annoying and lots of importers
used `modzip` as an alias. `modzip` is more descriptive and removes
that need.

Signed-off-by: Roger Peppe <[email protected]>
Change-Id: I2ecf795ac99fd169ad542d5e726748a6f742f870
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1171760
Reviewed-by: Daniel Martí <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>

Author: rogpeppe

cue/load/registry.go

@@ -12,7 +12,7 @@ import (
 	"cuelang.org/go/internal/mod/modfile"
 	"cuelang.org/go/internal/mod/modregistry"
 	"cuelang.org/go/internal/mod/module"
-	"cuelang.org/go/internal/mod/zip"
+	"cuelang.org/go/internal/mod/modzip"
 )
 
 // registryClient implements the protocol for talking to
@@ -88,7 +88,7 @@ func (c *registryClient) getModContents(ctx context.Context, mv module.Version)
 	if _, err := io.Copy(f, r); err != nil {
 		return "", fmt.Errorf("cannot copy data to zip file %q: %v", zipfile, err)
 	}
-	if err := zip.Unzip(modPath, mv, zipfile); err != nil {
+	if err := modzip.Unzip(modPath, mv, zipfile); err != nil {
 		return "", fmt.Errorf("cannot unzip %v: %v", mv, err)
 	}
 	return modPath, nil

internal/mod/modmux/mux_test.go

@@ -21,7 +21,7 @@ import (
 	"cuelang.org/go/internal/mod/modregistry"
 	"cuelang.org/go/internal/mod/modresolve"
 	"cuelang.org/go/internal/mod/module"
-	modzip "cuelang.org/go/internal/mod/zip"
+	"cuelang.org/go/internal/mod/modzip"
 	"cuelang.org/go/internal/registrytest"
 )
 

internal/mod/modregistry/client.go

@@ -32,7 +32,7 @@ import (
 
 	"cuelang.org/go/internal/mod/modfile"
 	"cuelang.org/go/internal/mod/module"
-	modzip "cuelang.org/go/internal/mod/zip"
+	"cuelang.org/go/internal/mod/modzip"
 )
 
 var ErrNotFound = fmt.Errorf("module not found")

internal/mod/modregistry/client_test.go

@@ -30,7 +30,7 @@ import (
 	"cuelabs.dev/go/oci/ociregistry/ocimem"
 
 	"cuelang.org/go/internal/mod/module"
-	modzip "cuelang.org/go/internal/mod/zip"
+	"cuelang.org/go/internal/mod/modzip"
 )
 
 func newTestClient(t *testing.T) *Client {

internal/mod/zip/testdata/check_dir/empty.txt internal/mod/modzip/testdata/check_dir/empty.txt

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package zip
+package modzip
 
 import "testing"
 

internal/mod/zip/testdata/check_dir/various.txt internal/mod/modzip/testdata/check_dir/various.txt

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Package zip provides functions for creating and extracting module zip files.
+// Package modzip provides functions for creating and extracting module zip files.
 //
 // Module zip files have several restrictions listed below. These are necessary
 // to ensure that module zip files can be extracted consistently on supported
@@ -35,7 +35,7 @@
 //
 // Note that this package does not provide hashing functionality. See
 // golang.org/x/mod/sumdb/dirhash.
-package zip
+package modzip
 
 import (
 	"archive/zip"

internal/mod/zip/testdata/check_files/empty.txt internal/mod/modzip/testdata/check_files/empty.txt

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package zip_test
+package modzip_test
 
 import (
 	"archive/zip"
@@ -22,7 +22,7 @@ import (
 
 	"cuelang.org/go/internal/cuetest"
 	"cuelang.org/go/internal/mod/module"
-	modzip "cuelang.org/go/internal/mod/zip"
+	"cuelang.org/go/internal/mod/modzip"
 	"golang.org/x/mod/sumdb/dirhash"
 	"golang.org/x/tools/txtar"
 )

internal/mod/zip/testdata/check_files/various.txt internal/mod/modzip/testdata/check_files/various.txt

@@ -23,7 +23,7 @@ import (
 	"cuelang.org/go/internal/mod/modfile"
 	"cuelang.org/go/internal/mod/modregistry"
 	"cuelang.org/go/internal/mod/module"
-	"cuelang.org/go/internal/mod/zip"
+	"cuelang.org/go/internal/mod/modzip"
 )
 
 // AuthConfig specifies authorization requirements for the server.
@@ -219,7 +219,7 @@ type moduleContent struct {
 }
 
 func (c *moduleContent) writeZip(w io.Writer) error {
-	return zip.Create[txtar.File](w, c.version, c.files, txtarFileIO{})
+	return modzip.Create[txtar.File](w, c.version, c.files, txtarFileIO{})
 }
 
 func (c *moduleContent) init(ctx *cue.Context, versDir string) error {