From d9bfda81249f25959090b1493ac8e261dd4542f4 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Fri, 30 Apr 2021 01:51:16 -0400 Subject: [PATCH] cmd/go: remove the special case for "unsafe" in importFromModules 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 Run-TryBot: Bryan C. Mills TryBot-Result: Go Bot Reviewed-by: Michael Matloob --- src/cmd/go/internal/modload/import.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/go/internal/modload/import.go b/src/cmd/go/internal/modload/import.go index 6c863351ff..f76befcfe3 100644 --- a/src/cmd/go/internal/modload/import.go +++ b/src/cmd/go/internal/modload/import.go @@ -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. -- 2.48.1