From 4d5fbfb90dbbde4f56f512e333c7eb5e967bbee2 Mon Sep 17 00:00:00 2001 From: Abhinav Gupta Date: Fri, 18 Aug 2023 17:04:34 -0700 Subject: [PATCH] Fix renames (1.21, not 1.20), simplify constraints Constraints don't need the go1.19 minimum. Just "anything before 1.21" is good enough. --- exp/zapslog/{example_go120_test.go => example_go121_test.go} | 0 .../{example_pre_go120_test.go => example_pre_go121_test.go} | 2 +- exp/zapslog/slog_pre_go121.go | 2 +- exp/zapslog/slog_pre_go121_test.go | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename exp/zapslog/{example_go120_test.go => example_go121_test.go} (100%) rename exp/zapslog/{example_pre_go120_test.go => example_pre_go121_test.go} (98%) diff --git a/exp/zapslog/example_go120_test.go b/exp/zapslog/example_go121_test.go similarity index 100% rename from exp/zapslog/example_go120_test.go rename to exp/zapslog/example_go121_test.go diff --git a/exp/zapslog/example_pre_go120_test.go b/exp/zapslog/example_pre_go121_test.go similarity index 98% rename from exp/zapslog/example_pre_go120_test.go rename to exp/zapslog/example_pre_go121_test.go index ef6984411..666a7697c 100644 --- a/exp/zapslog/example_pre_go120_test.go +++ b/exp/zapslog/example_pre_go121_test.go @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -//go:build go1.19 && !go1.21 +//go:build !go1.21 package zapslog_test diff --git a/exp/zapslog/slog_pre_go121.go b/exp/zapslog/slog_pre_go121.go index 8e8d8cfc4..0a4f30db9 100644 --- a/exp/zapslog/slog_pre_go121.go +++ b/exp/zapslog/slog_pre_go121.go @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -//go:build go1.19 && !go1.21 +//go:build !go1.21 package zapslog diff --git a/exp/zapslog/slog_pre_go121_test.go b/exp/zapslog/slog_pre_go121_test.go index 3556c9e88..59db21743 100644 --- a/exp/zapslog/slog_pre_go121_test.go +++ b/exp/zapslog/slog_pre_go121_test.go @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -//go:build go1.19 && !go1.21 +//go:build !go1.21 package zapslog