all: make goimports happy
run goimports with -local flag. separates cue packages and other.
$ goimports -w -local cuelang.org/go .
Change-Id: I3849b916fde18e4f62789cfe5220e12a84aaddbc
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/4501
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
diff --git a/encoding/gocode/generator.go b/encoding/gocode/generator.go
index 494edf1..557bdcd 100644
--- a/encoding/gocode/generator.go
+++ b/encoding/gocode/generator.go
@@ -22,10 +22,11 @@
"go/types"
"text/template"
+ "golang.org/x/tools/go/packages"
+
"cuelang.org/go/cue"
"cuelang.org/go/cue/errors"
"cuelang.org/go/internal"
- "golang.org/x/tools/go/packages"
)
// Config defines options for generation Go code.
diff --git a/encoding/gocode/generator_test.go b/encoding/gocode/generator_test.go
index a4ad90a..85780cc 100644
--- a/encoding/gocode/generator_test.go
+++ b/encoding/gocode/generator_test.go
@@ -23,10 +23,11 @@
"regexp"
"testing"
+ "github.com/kylelemons/godebug/diff"
+
"cuelang.org/go/cue"
"cuelang.org/go/cue/errors"
"cuelang.org/go/cue/load"
- "github.com/kylelemons/godebug/diff"
)
var update = flag.Bool("update", false, "update test files")
diff --git a/encoding/gocode/gocodec/codec_test.go b/encoding/gocode/gocodec/codec_test.go
index 0765c46..25cc140 100644
--- a/encoding/gocode/gocodec/codec_test.go
+++ b/encoding/gocode/gocodec/codec_test.go
@@ -19,8 +19,9 @@
"reflect"
"testing"
- "cuelang.org/go/cue"
"github.com/google/go-cmp/cmp"
+
+ "cuelang.org/go/cue"
)
type Sum struct {
diff --git a/encoding/json/json_test.go b/encoding/json/json_test.go
index f8469ca..d12da3c 100644
--- a/encoding/json/json_test.go
+++ b/encoding/json/json_test.go
@@ -21,9 +21,10 @@
"strings"
"testing"
+ "github.com/stretchr/testify/assert"
+
"cuelang.org/go/cue/ast"
"cuelang.org/go/cue/format"
- "github.com/stretchr/testify/assert"
)
func TestExtract(t *testing.T) {
diff --git a/encoding/openapi/build.go b/encoding/openapi/build.go
index 8dc1db7..405b21c 100644
--- a/encoding/openapi/build.go
+++ b/encoding/openapi/build.go
@@ -24,10 +24,11 @@
"strconv"
"strings"
+ "github.com/cockroachdb/apd/v2"
+
"cuelang.org/go/cue"
"cuelang.org/go/cue/errors"
"cuelang.org/go/cue/token"
- "github.com/cockroachdb/apd/v2"
)
type buildContext struct {
diff --git a/encoding/openapi/openapi_test.go b/encoding/openapi/openapi_test.go
index 56a96cc..fdfdd3f 100644
--- a/encoding/openapi/openapi_test.go
+++ b/encoding/openapi/openapi_test.go
@@ -23,10 +23,11 @@
"strings"
"testing"
+ "github.com/kylelemons/godebug/diff"
+
"cuelang.org/go/cue"
"cuelang.org/go/cue/errors"
"cuelang.org/go/cue/load"
- "github.com/kylelemons/godebug/diff"
)
var update *bool = flag.Bool("update", false, "update the test output")
diff --git a/encoding/protobuf/parse.go b/encoding/protobuf/parse.go
index 917f7fd..a58943d 100644
--- a/encoding/protobuf/parse.go
+++ b/encoding/protobuf/parse.go
@@ -26,12 +26,13 @@
"text/scanner"
"unicode"
+ "github.com/emicklei/proto"
+
"cuelang.org/go/cue/ast"
"cuelang.org/go/cue/errors"
"cuelang.org/go/cue/parser"
"cuelang.org/go/cue/token"
"cuelang.org/go/internal/source"
- "github.com/emicklei/proto"
)
func (s *Extractor) parse(filename string, src interface{}) (p *protoConverter, err error) {
diff --git a/encoding/protobuf/protobuf.go b/encoding/protobuf/protobuf.go
index a52df13..aa5189e 100644
--- a/encoding/protobuf/protobuf.go
+++ b/encoding/protobuf/protobuf.go
@@ -91,6 +91,8 @@
"sort"
"strings"
+ "github.com/mpvl/unique"
+
"cuelang.org/go/cue/ast"
"cuelang.org/go/cue/build"
"cuelang.org/go/cue/errors"
@@ -98,7 +100,6 @@
"cuelang.org/go/cue/load"
"cuelang.org/go/cue/parser"
"cuelang.org/go/cue/token"
- "github.com/mpvl/unique"
)
// Config specifies the environment into which to parse a proto definition file.
diff --git a/encoding/protobuf/protobuf_test.go b/encoding/protobuf/protobuf_test.go
index b824e05..2ce5d5f 100644
--- a/encoding/protobuf/protobuf_test.go
+++ b/encoding/protobuf/protobuf_test.go
@@ -24,10 +24,11 @@
"strings"
"testing"
+ "github.com/kr/pretty"
+
"cuelang.org/go/cue/ast"
"cuelang.org/go/cue/errors"
"cuelang.org/go/cue/format"
- "github.com/kr/pretty"
)
var update = flag.Bool("update", false, "update the test output")
diff --git a/encoding/protobuf/util.go b/encoding/protobuf/util.go
index 53b3b43..ad63285 100644
--- a/encoding/protobuf/util.go
+++ b/encoding/protobuf/util.go
@@ -18,10 +18,11 @@
"strings"
"text/scanner"
- "cuelang.org/go/cue/ast"
- "cuelang.org/go/cue/token"
"github.com/emicklei/proto"
"golang.org/x/xerrors"
+
+ "cuelang.org/go/cue/ast"
+ "cuelang.org/go/cue/token"
)
// failf panics with a marked error that can be intercepted upon returning
diff --git a/encoding/yaml/yaml.go b/encoding/yaml/yaml.go
index 4339e7d..f972bd2 100644
--- a/encoding/yaml/yaml.go
+++ b/encoding/yaml/yaml.go
@@ -20,11 +20,12 @@
"bytes"
"io"
+ goyaml "github.com/ghodss/yaml"
+
"cuelang.org/go/cue"
"cuelang.org/go/cue/ast"
"cuelang.org/go/internal/third_party/yaml"
pkgyaml "cuelang.org/go/pkg/encoding/yaml"
- goyaml "github.com/ghodss/yaml"
)
// TODO: replace the ghodss YAML encoder. It has a few major issues:
