Skip to content

Commit

Permalink
all: give nested modules fully-qualified names
Browse files Browse the repository at this point in the history
The two crypto modules are both named "asm". If both are included in a
single go.work (e.g., from `go work use -r .` in the repo), builds break
from "module asm appears multiple times in workspace".

Give these modules fully-qualified names to avoid conflicts. While we
are here, also expand the name of two other testdata modules. Those
modules don't currently conflict, but they have vague names at risk of
future conflicts.

Fixes #57769.

Change-Id: I2bd8a505051e92348d49560ec698ed921f2c81be
Reviewed-on: https://go-review.googlesource.com/c/go/+/461896
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Filippo Valsorda <filippo@golang.org>
Run-TryBot: Michael Pratt <mpratt@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Auto-Submit: Michael Pratt <mpratt@google.com>
  • Loading branch information
prattmic authored and gopherbot committed Jan 30, 2023
1 parent 9e45b1d commit f2a2600
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/cmd/objdump/testdata/testfilenum/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module objdumptest
module cmd/objdump/testdata/testfilenum

go 1.16
2 changes: 1 addition & 1 deletion src/crypto/internal/bigmod/_asm/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module asm
module std/crypto/internal/bigmod/_asm

go 1.19

Expand Down
2 changes: 1 addition & 1 deletion src/crypto/internal/edwards25519/field/_asm/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module asm
module std/crypto/internal/edwards25519/field/_asm

go 1.19

Expand Down

0 comments on commit f2a2600

Please sign in to comment.