From b81abded1992fa15f63214b13e9dea225b9155d0 Mon Sep 17 00:00:00 2001
From: Michael Hobbs <michaelshobbs@users.noreply.github.com>
Date: Wed, 1 Sep 2021 19:14:16 -0700
Subject: [PATCH] update goimports formatting for go1.17

---
 auth/kerberos/krb_unix.go    | 3 ++-
 auth/kerberos/krb_windows.go | 3 ++-
 connector_example_test.go    | 1 +
 connector_test.go            | 1 +
 go19_test.go                 | 1 +
 notice.go                    | 1 +
 notice_example_test.go       | 1 +
 notice_test.go               | 1 +
 oid/gen.go                   | 1 +
 ssl_permissions.go           | 1 +
 ssl_windows.go               | 1 +
 user_other.go                | 1 +
 user_posix.go                | 1 +
 13 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/auth/kerberos/krb_unix.go b/auth/kerberos/krb_unix.go
index c625a2105..b6f27ce57 100644
--- a/auth/kerberos/krb_unix.go
+++ b/auth/kerberos/krb_unix.go
@@ -1,4 +1,5 @@
-//+build !windows
+//go:build !windows
+// +build !windows
 
 package kerberos
 
diff --git a/auth/kerberos/krb_windows.go b/auth/kerberos/krb_windows.go
index 348f64e99..ca26d02c6 100644
--- a/auth/kerberos/krb_windows.go
+++ b/auth/kerberos/krb_windows.go
@@ -1,4 +1,5 @@
-//+build windows
+//go:build windows
+// +build windows
 
 package kerberos
 
diff --git a/connector_example_test.go b/connector_example_test.go
index 9401fa0d4..dbae4db52 100644
--- a/connector_example_test.go
+++ b/connector_example_test.go
@@ -1,3 +1,4 @@
+//go:build go1.10
 // +build go1.10
 
 package pq_test
diff --git a/connector_test.go b/connector_test.go
index 3d2c67b06..d68810e9e 100644
--- a/connector_test.go
+++ b/connector_test.go
@@ -1,3 +1,4 @@
+//go:build go1.10
 // +build go1.10
 
 package pq
diff --git a/go19_test.go b/go19_test.go
index 25566d6f8..f810e4890 100644
--- a/go19_test.go
+++ b/go19_test.go
@@ -1,3 +1,4 @@
+//go:build go1.9
 // +build go1.9
 
 package pq
diff --git a/notice.go b/notice.go
index 01dd8c723..70ad122a7 100644
--- a/notice.go
+++ b/notice.go
@@ -1,3 +1,4 @@
+//go:build go1.10
 // +build go1.10
 
 package pq
diff --git a/notice_example_test.go b/notice_example_test.go
index 9392ad0bb..04bcb1d9d 100644
--- a/notice_example_test.go
+++ b/notice_example_test.go
@@ -1,3 +1,4 @@
+//go:build go1.10
 // +build go1.10
 
 package pq_test
diff --git a/notice_test.go b/notice_test.go
index 92212e778..e9da9af3a 100644
--- a/notice_test.go
+++ b/notice_test.go
@@ -1,3 +1,4 @@
+//go:build go1.10
 // +build go1.10
 
 package pq
diff --git a/oid/gen.go b/oid/gen.go
index 7c634cdc5..29a8de8ba 100644
--- a/oid/gen.go
+++ b/oid/gen.go
@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 // Generate the table of OID values
diff --git a/ssl_permissions.go b/ssl_permissions.go
index 3b7c3a2a3..014af6a16 100644
--- a/ssl_permissions.go
+++ b/ssl_permissions.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package pq
diff --git a/ssl_windows.go b/ssl_windows.go
index 5d2c763ce..73663c8f1 100644
--- a/ssl_windows.go
+++ b/ssl_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package pq
diff --git a/user_other.go b/user_other.go
index 85f70ba70..3dae8f557 100644
--- a/user_other.go
+++ b/user_other.go
@@ -1,5 +1,6 @@
 // Package pq is a pure Go Postgres driver for the database/sql package.
 
+//go:build js || android || hurd || zos
 // +build js android hurd zos
 
 package pq
diff --git a/user_posix.go b/user_posix.go
index 22299322a..227a948e0 100644
--- a/user_posix.go
+++ b/user_posix.go
@@ -1,5 +1,6 @@
 // Package pq is a pure Go Postgres driver for the database/sql package.
 
+//go:build aix || darwin || dragonfly || freebsd || linux || nacl || netbsd || openbsd || plan9 || solaris || rumprun || illumos
 // +build aix darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris rumprun illumos
 
 package pq