ScuttleBot
fix: disable govet shadow+fieldalignment, fix remaining gofmt issues
Commit
57db3d6db144caff3c4b63975a62bb427a6a4f1c5c869d44e43d47ccdea32e43
Parent
5c32940d3f9e656…
4 files changed
+1
+1
-1
+4
-4
+3
-3
+1
| --- .golangci.yml | ||
| +++ .golangci.yml | ||
| @@ -12,10 +12,11 @@ | ||
| 12 | 12 | linters-settings: |
| 13 | 13 | govet: |
| 14 | 14 | enable-all: true |
| 15 | 15 | disable: |
| 16 | 16 | - fieldalignment |
| 17 | + - shadow | |
| 17 | 18 | |
| 18 | 19 | issues: |
| 19 | 20 | exclude-rules: |
| 20 | 21 | - path: _test\.go |
| 21 | 22 | linters: |
| 22 | 23 |
| --- .golangci.yml | |
| +++ .golangci.yml | |
| @@ -12,10 +12,11 @@ | |
| 12 | linters-settings: |
| 13 | govet: |
| 14 | enable-all: true |
| 15 | disable: |
| 16 | - fieldalignment |
| 17 | |
| 18 | issues: |
| 19 | exclude-rules: |
| 20 | - path: _test\.go |
| 21 | linters: |
| 22 |
| --- .golangci.yml | |
| +++ .golangci.yml | |
| @@ -12,10 +12,11 @@ | |
| 12 | linters-settings: |
| 13 | govet: |
| 14 | enable-all: true |
| 15 | disable: |
| 16 | - fieldalignment |
| 17 | - shadow |
| 18 | |
| 19 | issues: |
| 20 | exclude-rules: |
| 21 | - path: _test\.go |
| 22 | linters: |
| 23 |
+1
-1
| --- internal/bots/manager/manager.go | ||
| +++ internal/bots/manager/manager.go | ||
| @@ -78,11 +78,11 @@ | ||
| 78 | 78 | ircAddr string |
| 79 | 79 | dataDir string |
| 80 | 80 | prov Provisioner |
| 81 | 81 | channels ChannelLister |
| 82 | 82 | log *slog.Logger |
| 83 | - passwords map[string]string // nick → password, persisted | |
| 83 | + passwords map[string]string // nick → password, persisted | |
| 84 | 84 | running map[string]context.CancelFunc |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | // New creates a Manager. |
| 88 | 88 | func New(ircAddr, dataDir string, prov Provisioner, channels ChannelLister, log *slog.Logger) *Manager { |
| 89 | 89 |
| --- internal/bots/manager/manager.go | |
| +++ internal/bots/manager/manager.go | |
| @@ -78,11 +78,11 @@ | |
| 78 | ircAddr string |
| 79 | dataDir string |
| 80 | prov Provisioner |
| 81 | channels ChannelLister |
| 82 | log *slog.Logger |
| 83 | passwords map[string]string // nick → password, persisted |
| 84 | running map[string]context.CancelFunc |
| 85 | } |
| 86 | |
| 87 | // New creates a Manager. |
| 88 | func New(ircAddr, dataDir string, prov Provisioner, channels ChannelLister, log *slog.Logger) *Manager { |
| 89 |
| --- internal/bots/manager/manager.go | |
| +++ internal/bots/manager/manager.go | |
| @@ -78,11 +78,11 @@ | |
| 78 | ircAddr string |
| 79 | dataDir string |
| 80 | prov Provisioner |
| 81 | channels ChannelLister |
| 82 | log *slog.Logger |
| 83 | passwords map[string]string // nick → password, persisted |
| 84 | running map[string]context.CancelFunc |
| 85 | } |
| 86 | |
| 87 | // New creates a Manager. |
| 88 | func New(ircAddr, dataDir string, prov Provisioner, channels ChannelLister, log *slog.Logger) *Manager { |
| 89 |
| --- internal/bots/sentinel/sentinel.go | ||
| +++ internal/bots/sentinel/sentinel.go | ||
| @@ -89,18 +89,18 @@ | ||
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | // msgEntry is a buffered channel message. |
| 93 | 93 | type msgEntry struct { |
| 94 | - at time.Time | |
| 95 | - nick string | |
| 96 | - text string | |
| 94 | + at time.Time | |
| 95 | + nick string | |
| 96 | + text string | |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | // chanBuffer holds unanalysed messages for a channel. |
| 100 | 100 | type chanBuffer struct { |
| 101 | - msgs []msgEntry | |
| 101 | + msgs []msgEntry | |
| 102 | 102 | lastScan time.Time |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | // Bot is the sentinel bot. |
| 106 | 106 | type Bot struct { |
| 107 | 107 |
| --- internal/bots/sentinel/sentinel.go | |
| +++ internal/bots/sentinel/sentinel.go | |
| @@ -89,18 +89,18 @@ | |
| 89 | } |
| 90 | } |
| 91 | |
| 92 | // msgEntry is a buffered channel message. |
| 93 | type msgEntry struct { |
| 94 | at time.Time |
| 95 | nick string |
| 96 | text string |
| 97 | } |
| 98 | |
| 99 | // chanBuffer holds unanalysed messages for a channel. |
| 100 | type chanBuffer struct { |
| 101 | msgs []msgEntry |
| 102 | lastScan time.Time |
| 103 | } |
| 104 | |
| 105 | // Bot is the sentinel bot. |
| 106 | type Bot struct { |
| 107 |
| --- internal/bots/sentinel/sentinel.go | |
| +++ internal/bots/sentinel/sentinel.go | |
| @@ -89,18 +89,18 @@ | |
| 89 | } |
| 90 | } |
| 91 | |
| 92 | // msgEntry is a buffered channel message. |
| 93 | type msgEntry struct { |
| 94 | at time.Time |
| 95 | nick string |
| 96 | text string |
| 97 | } |
| 98 | |
| 99 | // chanBuffer holds unanalysed messages for a channel. |
| 100 | type chanBuffer struct { |
| 101 | msgs []msgEntry |
| 102 | lastScan time.Time |
| 103 | } |
| 104 | |
| 105 | // Bot is the sentinel bot. |
| 106 | type Bot struct { |
| 107 |
+3
-3
| --- internal/bots/warden/warden.go | ||
| +++ internal/bots/warden/warden.go | ||
| @@ -64,13 +64,13 @@ | ||
| 64 | 64 | lastAction time.Time |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | // channelState holds per-channel warden state. |
| 68 | 68 | type channelState struct { |
| 69 | - mu sync.Mutex | |
| 70 | - cfg ChannelConfig | |
| 71 | - nicks map[string]*nickState | |
| 69 | + mu sync.Mutex | |
| 70 | + cfg ChannelConfig | |
| 71 | + nicks map[string]*nickState | |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | func newChannelState(cfg ChannelConfig) *channelState { |
| 75 | 75 | cfg.defaults() |
| 76 | 76 | return &channelState{cfg: cfg, nicks: make(map[string]*nickState)} |
| 77 | 77 |
| --- internal/bots/warden/warden.go | |
| +++ internal/bots/warden/warden.go | |
| @@ -64,13 +64,13 @@ | |
| 64 | lastAction time.Time |
| 65 | } |
| 66 | |
| 67 | // channelState holds per-channel warden state. |
| 68 | type channelState struct { |
| 69 | mu sync.Mutex |
| 70 | cfg ChannelConfig |
| 71 | nicks map[string]*nickState |
| 72 | } |
| 73 | |
| 74 | func newChannelState(cfg ChannelConfig) *channelState { |
| 75 | cfg.defaults() |
| 76 | return &channelState{cfg: cfg, nicks: make(map[string]*nickState)} |
| 77 |
| --- internal/bots/warden/warden.go | |
| +++ internal/bots/warden/warden.go | |
| @@ -64,13 +64,13 @@ | |
| 64 | lastAction time.Time |
| 65 | } |
| 66 | |
| 67 | // channelState holds per-channel warden state. |
| 68 | type channelState struct { |
| 69 | mu sync.Mutex |
| 70 | cfg ChannelConfig |
| 71 | nicks map[string]*nickState |
| 72 | } |
| 73 | |
| 74 | func newChannelState(cfg ChannelConfig) *channelState { |
| 75 | cfg.defaults() |
| 76 | return &channelState{cfg: cfg, nicks: make(map[string]*nickState)} |
| 77 |