resolve conflict

2024-12-19 13:36:55 +03:00 · 2024-12-19 13:36:55 +03:00 · 1ba02ed8ad
commit 1ba02ed8ad
parent 7c5da60556
3 changed files with 6 additions and 8 deletions
--- a/.golangci.yml
+++ b/.golangci.yml
@ -10,7 +10,6 @@ linters:
    - unused
    - gosimple
    - govet
-    - goimports
    - prealloc
    - unconvert
    - nakedret
--- a/event.go
+++ b/event.go
@ -10,11 +10,10 @@ import (
 type event struct {
 	msg *broker.Message
 	err error
+	ctx context.Context

 	topic string

-	ctx   context.Context
-
 	sync.RWMutex
 	ack bool
 }
--- a/kgo.go
+++ b/kgo.go
@ -61,7 +61,7 @@ type Broker struct {
 	connected *atomic.Uint32

 	kopts []kgo.Opt
-	subs  []*subscriber
+	subs  []*Subscriber

 	opts broker.Options