database/sql: follow convention for field naming

Change-Id: I161072698dad8f184b46c6e627bbfbcb18a1b5c6
GitHub-Last-Rev: 7c8d2412806e6017e7129a5535adace396e6be30
GitHub-Pull-Request: golang/go#52770
Reviewed-on: https://go-review.googlesource.com/c/go/+/404934
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>

diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go
index f408a34234a1a44727ed443c1ec5a5401d854823..04897b33604dbd6ff631638c0ccc18def6fd8cac 100644 (file)
--- a/src/database/sql/sql.go
+++ b/src/database/sql/sql.go
@@ -79,7 +79,7 @@ func Drivers() []string {
 // For a more concise way to create NamedArg values, see
 // the Named function.
 type NamedArg struct {
-       _Named_Fields_Required struct{}
+       _NamedFieldsRequired struct{}
 
        // Name is the name of the parameter placeholder.
        //
@@ -423,7 +423,7 @@ type Scanner interface {
 //     var outArg string
 //     _, err := db.ExecContext(ctx, "ProcName", sql.Named("Arg1", sql.Out{Dest: &outArg}))
 type Out struct {
-       _Named_Fields_Required struct{}
+       _NamedFieldsRequired struct{}
 
        // Dest is a pointer to the value that will be set to the result of the
        // stored procedure's OUTPUT parameter.
@@ -721,7 +721,6 @@ func (db *DB) removeDep(x finalCloser, dep any) error {
 }
 
 func (db *DB) removeDepLocked(x finalCloser, dep any) func() error {
-
        xdep, ok := db.dep[x]
        if !ok {
                panic(fmt.Sprintf("unpaired removeDep: no deps for %T", x))