Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: fix error check messages for 2 types2 tests #46445

Closed
wants to merge 3 commits into from
Closed

test: fix error check messages for 2 types2 tests #46445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42d981c
test: fix error check messages for 2 types2 tests
May 29, 2021
c35e63c
test: fix error check messages for 2 types2 tests
May 29, 2021
0ed904b
Merge branch 'dev.typeparams' of github.com:zacharyburkett/go into de…
May 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions test/complit1.go
View file
Open in desktop
Expand Up @@ -46,20 +46,20 @@ var (
_ = &T{0, 0, "", nil} // ok
_ = &T{i: 0, f: 0, s: "", next: {}} // ERROR "missing type in composite literal|omit types within composite literal"
_ = &T{0, 0, "", {}} // ERROR "missing type in composite literal|omit types within composite literal"
_ = TP{i: 0, f: 0, s: "", next: {}} // ERROR "invalid composite literal type TP|omit types within composite literal"
_ = TP{i: 0, f: 0, s: ""} // ERROR "invalid composite literal type TP"
_ = &Ti{} // ERROR "invalid composite literal type Ti|expected.*type for composite literal"
)

type M map[T]T

var (
_ = M{{i:1}: {i:2}}
_ = M{T{i:1}: {i:2}}
_ = M{{i:1}: T{i:2}}
_ = M{T{i:1}: T{i:2}}
_ = M{{i: 1}: {i: 2}}
_ = M{T{i: 1}: {i: 2}}
_ = M{{i: 1}: T{i: 2}}
_ = M{T{i: 1}: T{i: 2}}
)

type S struct { s [1]*M1 }
type S struct{ s [1]*M1 }
type M1 map[S]int
var _ = M1{{s:[1]*M1{&M1{{}:1}}}:2}

var _ = M1{{s: [1]*M1{&M1{{}: 1}}}: 2}
10 changes: 5 additions & 5 deletions test/ddd1.go
View file
Open in desktop
Expand Up @@ -17,8 +17,8 @@ var (
_ = sum(1, 2, 3)
_ = sum()
_ = sum(1.0, 2.0)
_ = sum(1.5) // ERROR "integer"
_ = sum("hello") // ERROR ".hello. .type untyped string. as type int|incompatible"
_ = sum(1.5) // ERROR "1\.5 .untyped float constant. as int|integer"
_ = sum("hello") // ERROR ".hello. (.untyped string constant. as int|.type untyped string. as type int)|incompatible"
_ = sum([]int{1}) // ERROR "\[\]int{...}.*as type int|incompatible"
)

Expand All @@ -27,9 +27,9 @@ func tuple() (int, int, int) { return 1, 2, 3 }

var (
_ = sum(tuple())
_ = sum(tuple()...) // ERROR "multiple-value"
_ = sum(tuple()...) // ERROR "\.{3} with 3-valued|multiple-value"
_ = sum3(tuple())
_ = sum3(tuple()...) // ERROR "multiple-value" ERROR "invalid use of .*[.][.][.]"
_ = sum3(tuple()...) // ERROR "\.{3} in call to non-variadic|multiple-value|invalid use of .*[.][.][.]"
)

type T []T
Expand Down Expand Up @@ -60,5 +60,5 @@ func bad(args ...int) {
_ = [...]byte("foo") // ERROR "[.][.][.]"
_ = [...][...]int{{1,2,3},{4,5,6}} // ERROR "[.][.][.]"

Foo(x...) // ERROR "invalid use of .*[.][.][.]"
Foo(x...) // ERROR "\.{3} in call to non-variadic|invalid use of .*[.][.][.]"
}
2 changes: 0 additions & 2 deletions test/run.go
View file
Open in desktop
Expand Up @@ -2023,8 +2023,6 @@ func overlayDir(dstRoot, srcRoot string) error {
// List of files that the compiler cannot errorcheck with the new typechecker (compiler -G option).
// Temporary scaffolding until we pass all the tests at which point this map can be removed.
var excludedFiles = map[string]bool{
"complit1.go": true, // types2 reports extra errors
"ddd1.go": true, // issue #42987
"directive.go": true, // misplaced compiler directive checks
"float_lit3.go": true, // types2 reports extra errors
"import1.go": true, // types2 reports extra errors
Expand Down