internal/registrytest: remove _registry remnants

A while ago we changed the registrytest so it didn't assume all
contents were in the `_registry` directory, but the package itself
still contained some logic related to that, so remove it.

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

Author: rogpeppe

internal/registrytest/registry.go

@@ -24,8 +24,8 @@ import (
 	"cuelang.org/go/internal/mod/zip"
 )
 
-// New starts a registry instance that serves modules found inside the
-// _registry path inside fsys. It serves the OCI registry protocol.
+// New starts a registry instance that serves modules found inside fsys.
+// It serves the OCI registry protocol.
 // If prefix is non-empty, all module paths will be prefixed by that,
 // separated by a slash (/).
 //
@@ -129,9 +129,9 @@ func getModules(fsys fs.FS) (map[module.Version]*moduleContent, error) {
 		if d.IsDir() {
 			return nil // we're only interested in regular files, not their parent directories
 		}
-		modver, rest, ok := strings.Cut(strings.TrimPrefix(path, "_registry/"), "/")
+		modver, rest, ok := strings.Cut(path, "/")
 		if !ok {
-			return fmt.Errorf("_registry should only contain directories, but found regular file %q", path)
+			return fmt.Errorf("registry should only contain directories, but found regular file %q", path)
 		}
 		content := modules[modver]
 		if content == nil {

internal/registrytest/testdata/simple.txtar

@@ -1,27 +1,27 @@
-modfile  [email protected] _registry/example.com_v0.0.1/cue.mod/module.cue
-modfile foo.com/bar/[email protected] _registry/foo.com_bar_hello_v0.2.3/cue.mod/module.cue
+modfile  [email protected] example.com_v0.0.1/cue.mod/module.cue
+modfile foo.com/bar/[email protected] foo.com_bar_hello_v0.2.3/cue.mod/module.cue
 
--- _registry/example.com_v0.0.1/cue.mod/module.cue --
+-- example.com_v0.0.1/cue.mod/module.cue --
 module: "example.com@v0"
 
 deps: {
 	"foo.com/bar/hello@v0": v: "v0.2.3"
 	"bar.com@v0": v: "v0.5.0"
 }
--- _registry/example.com_v0.0.1/top.cue --
+-- example.com_v0.0.1/top.cue --
 package main
 
 import a "foo.com/bar/hello"
 a
 main: "main"
--- _registry/foo.com_bar_hello_v0.2.3/cue.mod/module.cue --
+-- foo.com_bar_hello_v0.2.3/cue.mod/module.cue --
 module: "foo.com/bar/hello@v0"
 
 deps: {
 	"bar.com@v0": v: "v0.0.2"
 	"baz.org@v0": v: "v0.10.1"
 }
--- _registry/foo.com_bar_hello_v0.2.3/x.cue --
+-- foo.com_bar_hello_v0.2.3/x.cue --
 package hello
 import (
 	a "bar.com"
@@ -30,26 +30,26 @@ import (
 "foo.com/bar/hello": "v0.2.3"
 a
 b
--- _registry/bar.com_v0.0.2/cue.mod/module.cue --
+-- bar.com_v0.0.2/cue.mod/module.cue --
 module: "bar.com@v0"
 
 deps: "baz.org@v0": v: "v0.1.2"
--- _registry/bar.com_v0.0.2/bar/x.cue --
+-- bar.com_v0.0.2/bar/x.cue --
 package bar
 
 import a "baz.org/baz"
 
 "bar.com": "v0.0.2"
 a
--- _registry/baz.org_v0.10.1/cue.mod/module.cue --
+-- baz.org_v0.10.1/cue.mod/module.cue --
 module: "baz.org@v0"
--- _registry/baz.org_v0.10.1/baz.cue --
+-- baz.org_v0.10.1/baz.cue --
 "baz.org@v0": "v0.10.1"
 
--- _registry/baz.org_v0.1.2/cue.mod/module.cue --
+-- baz.org_v0.1.2/cue.mod/module.cue --
 module: "baz.org@v0"
 
--- _registry/bar.com_v0.5.0/cue.mod/module.cue --
+-- bar.com_v0.5.0/cue.mod/module.cue --
 module: "bar.com@v0"
--- _registry/bar.com_v0.5.0/bar.cue --
+-- bar.com_v0.5.0/bar.cue --
 "bar.com@v0": "v0.5.0"