Merge pull request #139 from cockroachdb/crl_fmt

Run cockroach-go through crlfmt.

Author: RichardJCai

crdb/common.go

@@ -14,9 +14,7 @@
 
 package crdb
 
-import (
-	"context"
-)
+import "context"
 
 // Tx abstracts the operations needed by ExecuteInTx so that different
 // frameworks (e.g. go's sql package, pgx, gorm) can be used with ExecuteInTx.

crdb/crdbpgx/pgx.go

@@ -16,8 +16,8 @@ package crdbpgx
 
 import (
 	"context"
-	"github.com/cockroachdb/cockroach-go/v2/crdb"
 
+	"github.com/cockroachdb/cockroach-go/v2/crdb"
 	"github.com/jackc/pgx/v4"
 )
 

crdb/crdbpgx/pgx_test.go

@@ -17,11 +17,12 @@ package crdbpgx
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/cockroachdb/cockroach-go/v2/crdb"
 	"github.com/cockroachdb/cockroach-go/v2/testserver"
 	"github.com/jackc/pgx/v4"
 	"github.com/jackc/pgx/v4/pgxpool"
-	"testing"
 )
 
 // TestExecuteTx verifies transaction retry using the classic

crdb/crdbsqlx/sqlx.go

@@ -18,18 +18,19 @@ import (
 	"context"
 	"database/sql"
 
+	"github.com/cockroachdb/cockroach-go/v2/crdb"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
-
-	"github.com/cockroachdb/cockroach-go/v2/crdb"
 )
 
 // ExecuteTx runs fn inside a transaction and retries it as needed. On
 // non-retryable failures, the transaction is aborted and rolled back; on
 // success, the transaction is committed.
 //
 // See crdb.ExecuteTx() for more information.
-func ExecuteTx(ctx context.Context, db *sqlx.DB, opts *sql.TxOptions, fn func(*sqlx.Tx) error) error {
+func ExecuteTx(
+	ctx context.Context, db *sqlx.DB, opts *sql.TxOptions, fn func(*sqlx.Tx) error,
+) error {
 	tx, err := db.BeginTxx(ctx, opts)
 	if err != nil {
 		return err

crdb/crdbsqlx/sqlx_test.go

@@ -19,11 +19,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/jmoiron/sqlx"
-	_ "github.com/lib/pq"
-
 	"github.com/cockroachdb/cockroach-go/v2/crdb"
 	"github.com/cockroachdb/cockroach-go/v2/testserver"
+	"github.com/jmoiron/sqlx"
+	_ "github.com/lib/pq"
 )
 
 // TestExecuteTx verifies transaction retry using the classic
@@ -94,7 +93,9 @@ func (t sqlxConnSkewTest) GetBalances(ctx context.Context, txi interface{}) (int
 }
 
 // UpdateBalance is part of the crdb.WriteSkewInterface.
-func (t sqlxConnSkewTest) UpdateBalance(ctx context.Context, txi interface{}, acct, delta int) error {
+func (t sqlxConnSkewTest) UpdateBalance(
+	ctx context.Context, txi interface{}, acct, delta int,
+) error {
 	tx := txi.(*sqlx.Tx)
 	_, err := tx.ExecContext(ctx, `UPDATE d.t SET balance=balance+$1 WHERE acct=$2;`, delta, acct)
 	return err