Skip to content

Fix staticcheck issues #1390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sirupsen merged 2 commits into from
Jun 3, 2023
+9 −5
Merged

Fix staticcheck issues #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f72d32
Fix go-staticcheck SA1029 issues
ashmckenzie Jun 3, 2023
80d649c
Fix go-staticcheck S1021 issues
ashmckenzie Jun 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions entry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
"github.com/stretchr/testify/assert"
)

type contextKeyType string

func TestEntryWithError(t *testing.T) {

assert := assert.New(t)
Expand All @@ -36,7 +38,8 @@ func TestEntryWithError(t *testing.T) {

func TestEntryWithContext(t *testing.T) {
assert := assert.New(t)
ctx := context.WithValue(context.Background(), "foo", "bar")
var contextKey contextKeyType = "foo"
ctx := context.WithValue(context.Background(), contextKey, "bar")

assert.Equal(ctx, WithContext(ctx).Context)

Expand All @@ -56,11 +59,13 @@ func TestEntryWithContextCopiesData(t *testing.T) {
parentEntry := NewEntry(logger).WithField("parentKey", "parentValue")

// Create two children Entry objects from the parent in different contexts
ctx1 := context.WithValue(context.Background(), "foo", "bar")
var contextKey1 contextKeyType = "foo"
ctx1 := context.WithValue(context.Background(), contextKey1, "bar")
childEntry1 := parentEntry.WithContext(ctx1)
assert.Equal(ctx1, childEntry1.Context)

ctx2 := context.WithValue(context.Background(), "bar", "baz")
var contextKey2 contextKeyType = "bar"
ctx2 := context.WithValue(context.Background(), contextKey2, "baz")
childEntry2 := parentEntry.WithContext(ctx2)
assert.Equal(ctx2, childEntry2.Context)
assert.NotEqual(ctx1, ctx2)
Expand Down
3 changes: 1 addition & 2 deletions logrus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,7 @@ func TestParseLevel(t *testing.T) {
}

func TestLevelString(t *testing.T) {
var loggerlevel Level
loggerlevel = 32000
var loggerlevel Level = 32000

_ = loggerlevel.String()
}
Expand Down