From cf3b5c1f34426c34c0e8c939fcc23c8d152d3310 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 30 Jul 2024 16:51:09 -0700 Subject: [PATCH] Use gofumpt to format code Brought to you by gofumpt v0.6.0 (go1.22.4). Add a CI action to check code is gofumpt'ed. Signed-off-by: Kir Kolyshkin --- .golangci.yml | 1 + capability.go | 48 ++++++++++++++++++++++++------------------------ enumgen/gen.go | 6 ++++-- syscall_linux.go | 4 +--- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index b19a99a..07064a0 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -2,3 +2,4 @@ linters: enable: - unconvert - unparam + - gofumpt diff --git a/capability.go b/capability.go index 61a9077..ac66c21 100644 --- a/capability.go +++ b/capability.go @@ -65,21 +65,21 @@ type Capabilities interface { // // Deprecated: Replace with NewPid2. For example, replace: // -// c, err := NewPid(0) -// if err != nil { -// return err -// } +// c, err := NewPid(0) +// if err != nil { +// return err +// } // // with: // -// c, err := NewPid2(0) -// if err != nil { -// return err -// } -// err = c.Load() -// if err != nil { -// return err -// } +// c, err := NewPid2(0) +// if err != nil { +// return err +// } +// err = c.Load() +// if err != nil { +// return err +// } func NewPid(pid int) (Capabilities, error) { c, err := newPid(pid) if err != nil { @@ -101,21 +101,21 @@ func NewPid2(pid int) (Capabilities, error) { // // Deprecated: Replace with NewFile2. For example, replace: // -// c, err := NewFile(path) -// if err != nil { -// return err -// } +// c, err := NewFile(path) +// if err != nil { +// return err +// } // // with: // -// c, err := NewFile2(path) -// if err != nil { -// return err -// } -// err = c.Load() -// if err != nil { -// return err -// } +// c, err := NewFile2(path) +// if err != nil { +// return err +// } +// err = c.Load() +// if err != nil { +// return err +// } func NewFile(path string) (Capabilities, error) { c, err := newFile(path) if err != nil { diff --git a/enumgen/gen.go b/enumgen/gen.go index 77e0ac1..2813e03 100644 --- a/enumgen/gen.go +++ b/enumgen/gen.go @@ -12,8 +12,10 @@ import ( "strings" ) -const fileName = "enum.go" -const genName = "enum_gen.go" +const ( + fileName = "enum.go" + genName = "enum_gen.go" +) type generator struct { buf bytes.Buffer diff --git a/syscall_linux.go b/syscall_linux.go index 3d2bf69..3e6ab34 100644 --- a/syscall_linux.go +++ b/syscall_linux.go @@ -79,9 +79,7 @@ type vfscapData struct { version int8 } -var ( - _vfsXattrName *byte -) +var _vfsXattrName *byte func init() { _vfsXattrName, _ = syscall.BytePtrFromString(vfsXattrName)