lint

bufbuild · Jan 9, 2025 · ffa3a70 · ffa3a70
1 parent ac9cf9a
commit ffa3a70
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/experimental/ast/decl_def.go b/experimental/ast/decl_def.go
@@ -45,17 +45,14 @@ import (
 type DeclDef struct{ declImpl[rawDeclDef] }
 
 type rawDeclDef struct {
-	ty   rawType // Not present for enum fields.
-	name rawPath
-
 	signature *rawSignature
-
-	equals token.ID
-	value  rawExpr
-
-	options arena.Pointer[rawCompactOptions]
-	body    arena.Pointer[rawDeclBody]
-	semi    token.ID
+	ty        rawType
+	value     rawExpr
+	name      rawPath
+	equals    token.ID
+	options   arena.Pointer[rawCompactOptions]
+	body      arena.Pointer[rawDeclBody]
+	semi      token.ID
 }
 
 // DeclDefArgs is arguments for creating a [DeclDef] with [Context.NewDeclDef].

diff --git a/experimental/ast/decl_file.go b/experimental/ast/decl_file.go
@@ -88,9 +88,11 @@ func (f File) Imports() iter.Seq2[int, DeclImport] {
 type DeclSyntax struct{ declImpl[rawDeclSyntax] }
 
 type rawDeclSyntax struct {
-	keyword, equals, semi token.ID
-	value                 rawExpr
-	options               arena.Pointer[rawCompactOptions]
+	value   rawExpr
+	keyword token.ID
+	equals  token.ID
+	semi    token.ID
+	options arena.Pointer[rawCompactOptions]
 }
 
 // DeclSyntaxArgs is arguments for [Context.NewDeclSyntax].
@@ -292,9 +294,11 @@ func wrapDeclPackage(c Context, ptr arena.Pointer[rawDeclPackage]) DeclPackage {
 type DeclImport struct{ declImpl[rawDeclImport] }
 
 type rawDeclImport struct {
-	keyword, modifier, semi token.ID
-	importPath              rawExpr
-	options                 arena.Pointer[rawCompactOptions]
+	importPath rawExpr
+	keyword    token.ID
+	modifier   token.ID
+	semi       token.ID
+	options    arena.Pointer[rawCompactOptions]
 }
 
 // DeclImportArgs is arguments for [Context.NewDeclImport].

diff --git a/internal/ext/slicesx/inline_test.go b/internal/ext/slicesx/inline_test.go
@@ -17,9 +17,10 @@ package slicesx_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/bufbuild/protocompile/experimental/seq"
 	"github.com/bufbuild/protocompile/internal/ext/slicesx"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestInline8(t *testing.T) {

diff --git a/internal/ext/slicesx/small_test.go b/internal/ext/slicesx/small_test.go
@@ -17,8 +17,9 @@ package slicesx_test
 import (
 	"testing"
 
-	"github.com/bufbuild/protocompile/internal/ext/slicesx"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/bufbuild/protocompile/internal/ext/slicesx"
 )
 
 func TestSmall(t *testing.T) {