Skip to content

Commit d1916e5

Browse files
author
Bryan C. Mills
committed
go/types: in TestCheck/issues.src, import regexp/syntax instead of cmd/compile/internal/syntax
TestCheck/issues.src was failing after running rm -r $(go env GOROOT)/pkg/*/cmd as the builders do when building binary releases. For users who write programs that depend on go/types, it should be reasonable for end users to run the tests for go/types as part of 'go test all', and those tests should pass even if they installed Go from a binary release. The test case in issues.src was importing cmd/compile/internal/syntax in order to check the reported package name. I tried to fix the problem by having the test import from source instead of from export data. Unfortunately, that changed the behavior under test: the go/types.Package.Imports reports (and is documented to report) a different set of imported packages when loading from source as compared to when loading from export data. For this particular test, after CL 313035 that difference resulted in go/types treating the "syntax" name as ambiguous when importing from source, because a transitive dependency on "regexp/syntax" is found when loading from source but omitted when loading from export data. The simple fix to make the package unambiguous again is to adapt the test to import regexp/syntax directly. That not only makes the package unambiguous with all importers, but also avoids depending on a cmd-internal package that cannot be loaded from export data in binary distributions of the Go toolchain. For #43232 Change-Id: Iba45a680ea20d26daa86ac538fd8f1938e8b73ab Reviewed-on: https://go-review.googlesource.com/c/go/+/330431 Trust: Bryan C. Mills <bcmills@google.com> Run-TryBot: Bryan C. Mills <bcmills@google.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Robert Findley <rfindley@google.com>
1 parent 5160896 commit d1916e5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/go/types/testdata/check/issues.src

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package issues
66

77
import (
88
"fmt"
9-
syn "cmd/compile/internal/syntax"
9+
syn "regexp/syntax"
1010
t1 "text/template"
1111
t2 "html/template"
1212
)
@@ -329,10 +329,10 @@ func (... /* ERROR can only use ... with final parameter */ TT) f()
329329
func issue28281g() (... /* ERROR can only use ... with final parameter */ TT)
330330

331331
// Issue #26234: Make various field/method lookup errors easier to read by matching cmd/compile's output
332-
func issue26234a(f *syn.File) {
332+
func issue26234a(f *syn.Prog) {
333333
// The error message below should refer to the actual package name (syntax)
334334
// not the local package name (syn).
335-
f.foo /* ERROR f\.foo undefined \(type \*syntax\.File has no field or method foo\) */
335+
f.foo /* ERROR f\.foo undefined \(type \*syntax\.Prog has no field or method foo\) */
336336
}
337337

338338
type T struct {
@@ -357,7 +357,7 @@ func issue35895() {
357357
var _ T = 0 // ERROR cannot use 0 \(untyped int constant\) as T
358358

359359
// There is only one package with name syntax imported, only use the (global) package name in error messages.
360-
var _ *syn.File = 0 // ERROR cannot use 0 \(untyped int constant\) as \*syntax.File
360+
var _ *syn.Prog = 0 // ERROR cannot use 0 \(untyped int constant\) as \*syntax.Prog
361361

362362
// Because both t1 and t2 have the same global package name (template),
363363
// qualify packages with full path name in this case.

0 commit comments

Comments
 (0)