]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go: remove the special case for "unsafe" in importFromModules
authorBryan C. Mills <bcmills@google.com>
Fri, 30 Apr 2021 05:51:16 +0000 (01:51 -0400)
committerBryan C. Mills <bcmills@google.com>
Fri, 30 Apr 2021 18:14:41 +0000 (18:14 +0000)
The comment for this special case claims:
> There's no directory for import "C" or import "unsafe".

However, there clearly is a directory for "unsafe" in
GOROOT/src/unsafe, and all of our integration tests seem to pass
without this special case. As far as I can tell, it's just confusing.

Also note that the internal/goroot package explicitly considers
package "unsafe" to be in the standard library; see CL 137435.

For #36460

Change-Id: Ib857d18f731a7f3c911c1bd116a34e3a9b3d74a5
Reviewed-on: https://go-review.googlesource.com/c/go/+/315412
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
src/cmd/go/internal/modload/import.go

index 6c863351ffe2af7942bfd275e5235fa820edc7fd..f76befcfe3525920697738b9b8de3c671fe121cc 100644 (file)
@@ -243,8 +243,8 @@ func importFromModules(ctx context.Context, path string, rs *Requirements, mg *M
        if build.IsLocalImport(path) {
                return module.Version{}, "", fmt.Errorf("relative import not supported")
        }
-       if path == "C" || path == "unsafe" {
-               // There's no directory for import "C" or import "unsafe".
+       if path == "C" {
+               // There's no directory for import "C".
                return module.Version{}, "", nil
        }
        // Before any further lookup, check that the path is valid.