diff options
author | Robert Findley <rfindley@google.com> | 2021-09-28 22:58:52 +0000 |
---|---|---|
committer | Robert Findley <rfindley@google.com> | 2021-09-28 23:30:19 +0000 |
commit | df9a164fb3601624c9ae20e7d953a4413b769abe (patch) | |
tree | 4a000414e4e42b9679f0f983413516620b8ea5fe /internal/typeparams | |
parent | 0df0ca0f43117120bd7cc900ebf765f9b799438a (diff) | |
download | golang-x-tools-df9a164fb3601624c9ae20e7d953a4413b769abe.tar.gz |
Revert "internal/typeparams: hide go1.18 API usage behind a build constraint"
This reverts commit 0df0ca0f43117120bd7cc900ebf765f9b799438a.
Reason for revert: we've tagged x/tools@v0.1.7, and want to use the new APIs again.
Change-Id: I5c6f2075833948cc21896d1746e0c51cc0712bb1
Reviewed-on: https://go-review.googlesource.com/c/tools/+/352855
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
Trust: Robert Findley <rfindley@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Diffstat (limited to 'internal/typeparams')
-rw-r--r-- | internal/typeparams/enabled_go117.go | 4 | ||||
-rw-r--r-- | internal/typeparams/enabled_go118.go | 4 | ||||
-rw-r--r-- | internal/typeparams/typeparams_go117.go | 4 | ||||
-rw-r--r-- | internal/typeparams/typeparams_go118.go | 4 | ||||
-rw-r--r-- | internal/typeparams/typeparams_test.go | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/internal/typeparams/enabled_go117.go b/internal/typeparams/enabled_go117.go index 72d010e51..18212390e 100644 --- a/internal/typeparams/enabled_go117.go +++ b/internal/typeparams/enabled_go117.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !typeparams || !go1.18 -// +build !typeparams !go1.18 +//go:build !go1.18 +// +build !go1.18 package typeparams diff --git a/internal/typeparams/enabled_go118.go b/internal/typeparams/enabled_go118.go index 642fc8ee2..d67148823 100644 --- a/internal/typeparams/enabled_go118.go +++ b/internal/typeparams/enabled_go118.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build typeparams && go1.18 -// +build typeparams,go1.18 +//go:build go1.18 +// +build go1.18 package typeparams diff --git a/internal/typeparams/typeparams_go117.go b/internal/typeparams/typeparams_go117.go index 12817af85..479b5561d 100644 --- a/internal/typeparams/typeparams_go117.go +++ b/internal/typeparams/typeparams_go117.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build !typeparams || !go1.18 -// +build !typeparams !go1.18 +//go:build !go1.18 +// +build !go1.18 package typeparams diff --git a/internal/typeparams/typeparams_go118.go b/internal/typeparams/typeparams_go118.go index 8ab17b777..16c6c0d15 100644 --- a/internal/typeparams/typeparams_go118.go +++ b/internal/typeparams/typeparams_go118.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build typeparams && go1.18 -// +build typeparams,go1.18 +//go:build go1.18 +// +build go1.18 package typeparams diff --git a/internal/typeparams/typeparams_test.go b/internal/typeparams/typeparams_test.go index 68e6409fa..9302ad75c 100644 --- a/internal/typeparams/typeparams_test.go +++ b/internal/typeparams/typeparams_test.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build typeparams && go1.18 -// +build typeparams,go1.18 +//go:build go1.18 +// +build go1.18 package typeparams_test |