From f2a2600860ebcd1b86a0d8b67308da0a3fa673f0 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Thu, 12 Jan 2023 16:55:19 -0500 Subject: [PATCH] all: give nested modules fully-qualified names 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 TryBot-Result: Gopher Robot Reviewed-by: Filippo Valsorda Run-TryBot: Michael Pratt Reviewed-by: Cherry Mui Auto-Submit: Michael Pratt --- src/cmd/objdump/testdata/testfilenum/go.mod | 2 +- src/crypto/internal/bigmod/_asm/go.mod | 2 +- src/crypto/internal/edwards25519/field/_asm/go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmd/objdump/testdata/testfilenum/go.mod b/src/cmd/objdump/testdata/testfilenum/go.mod index db432883a9..f0bd6b7603 100644 --- a/src/cmd/objdump/testdata/testfilenum/go.mod +++ b/src/cmd/objdump/testdata/testfilenum/go.mod @@ -1,3 +1,3 @@ -module objdumptest +module cmd/objdump/testdata/testfilenum go 1.16 diff --git a/src/crypto/internal/bigmod/_asm/go.mod b/src/crypto/internal/bigmod/_asm/go.mod index 1ce2b5e465..7600a4abbe 100644 --- a/src/crypto/internal/bigmod/_asm/go.mod +++ b/src/crypto/internal/bigmod/_asm/go.mod @@ -1,4 +1,4 @@ -module asm +module std/crypto/internal/bigmod/_asm go 1.19 diff --git a/src/crypto/internal/edwards25519/field/_asm/go.mod b/src/crypto/internal/edwards25519/field/_asm/go.mod index 1ce2b5e465..24ad644f76 100644 --- a/src/crypto/internal/edwards25519/field/_asm/go.mod +++ b/src/crypto/internal/edwards25519/field/_asm/go.mod @@ -1,4 +1,4 @@ -module asm +module std/crypto/internal/edwards25519/field/_asm go 1.19