From ab0262bd94c25bc91d5e0d831b75729c253dfde6 Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Thu, 23 Jul 2020 18:00:12 -0700 Subject: Convert go_generics tests to starlark. For some reason these tests were broken when run via the bazel docker container. The mechanism used was a bit crazy (self-extracting bundle), so convert them to use straight-forward starlark rules. This has the added advantaged that they are now independent tests. --- tools/go_generics/tests/anon/BUILD | 12 +++++++++ tools/go_generics/tests/anon/input.go | 46 ++++++++++++++++++++++++++++++++++ tools/go_generics/tests/anon/output.go | 42 +++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 tools/go_generics/tests/anon/BUILD create mode 100644 tools/go_generics/tests/anon/input.go create mode 100644 tools/go_generics/tests/anon/output.go (limited to 'tools/go_generics/tests/anon') diff --git a/tools/go_generics/tests/anon/BUILD b/tools/go_generics/tests/anon/BUILD new file mode 100644 index 000000000..1890f2817 --- /dev/null +++ b/tools/go_generics/tests/anon/BUILD @@ -0,0 +1,12 @@ +load("//tools/go_generics/tests:defs.bzl", "go_generics_test") + +go_generics_test( + name = "anon", + anon = True, + inputs = ["input.go"], + output = "output.go", + suffix = "New", + types = { + "T": "Q", + }, +) diff --git a/tools/go_generics/tests/anon/input.go b/tools/go_generics/tests/anon/input.go new file mode 100644 index 000000000..44086d522 --- /dev/null +++ b/tools/go_generics/tests/anon/input.go @@ -0,0 +1,46 @@ +// Copyright 2019 The gVisor Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package tests + +type T interface { + Apply(T) T +} + +type Foo struct { + T + Bar map[string]T `json:"bar,omitempty"` +} + +type Baz struct { + T someTypeNotT +} + +func (f Foo) GetBar(name string) T { + b, ok := f.Bar[name] + if ok { + b = f.Apply(b) + } else { + b = f.T + } + return b +} + +func foobar() { + a := Baz{} + a.T = 0 // should not be renamed, this is a limitation + + b := otherpkg.UnrelatedType{} + b.T = 0 // should not be renamed, this is a limitation +} diff --git a/tools/go_generics/tests/anon/output.go b/tools/go_generics/tests/anon/output.go new file mode 100644 index 000000000..7fa791853 --- /dev/null +++ b/tools/go_generics/tests/anon/output.go @@ -0,0 +1,42 @@ +// Copyright 2019 The gVisor Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +type FooNew struct { + Q + Bar map[string]Q `json:"bar,omitempty"` +} + +type BazNew struct { + T someTypeNotT +} + +func (f FooNew) GetBar(name string) Q { + b, ok := f.Bar[name] + if ok { + b = f.Apply(b) + } else { + b = f.Q + } + return b +} + +func foobarNew() { + a := BazNew{} + a.Q = 0 + + b := otherpkg.UnrelatedType{} + b.Q = 0 +} -- cgit v1.2.3