Skip to content

Commit

Permalink
get depend-a-bot PR green
Browse files Browse the repository at this point in the history
  • Loading branch information
jhump committed Feb 24, 2025
1 parent 08b9109 commit b8c98cb
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ linters:
- varnamelen
# Other disabled linters
- cyclop # covered by gocyclo
- exportloopref # deprecated in golangci-lint v1.60.2
- funlen # rely on code review to limit function length
- gocognit # dubious "cognitive overhead" quantification
- gofumpt # prefer standard gofmt
Expand All @@ -70,6 +69,7 @@ linters:
- protogetter # lots of false positives: can't use getter to check if field is present
- rowserrcheck # no SQL code in protocompile
- sqlclosecheck # no SQL code in protocompile
- tenv # deprecated in golangci-lint v1.64.0
- testpackage # internal tests are fine
- wastedassign # not supported with generics
- wrapcheck # don't _always_ need to wrap errors
Expand Down
4 changes: 1 addition & 3 deletions experimental/internal/taxa/classify.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,10 @@ func Classify(node report.Spanner) Noun {
first = pc
return false
})

if !first.AsExtension().IsZero() {
return CustomOption
} else {
return Option
}
return Option
case ast.DefField, ast.DefGroup:
return Field
case ast.DefEnumValue:
Expand Down
3 changes: 1 addition & 2 deletions internal/prototest/yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,8 @@ func (y *toYAML) value(v protoreflect.Value, f protoreflect.FieldDescriptor) any
enum := f.Enum()
if value := enum.Values().ByNumber(v); value != nil {
return value.Name()
} else {
return int32(v)
}
return int32(v)

case []byte:
return string(v)
Expand Down
3 changes: 2 additions & 1 deletion internal/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module github.com/bufbuild/protocompile/internal/tools

go 1.22.7
go 1.23.0

toolchain go1.23.6

require (
Expand Down

0 comments on commit b8c98cb

Please sign in to comment.