diff options
| -rw-r--r-- | .golangci.yaml | 1 | ||||
| -rw-r--r-- | objectstored/blob.go | 2 | ||||
| -rw-r--r-- | objectstored/commit.go | 2 | ||||
| -rw-r--r-- | objectstored/objectstored.go | 2 | ||||
| -rw-r--r-- | objectstored/tree.go | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/.golangci.yaml b/.golangci.yaml index 3c8128ed..c02cb461 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -8,6 +8,7 @@ linters: - internal/compress/internal disable: - dupword # extremely normal in tests and a pretty unnecessary linter + - ireturn # can't seem to ignore this linter properly and we don't need anyway, cf. tagged unions - goconst # unnecessary especially for our parsing code; many false positives - mnd # unnecessary especially for our parsing code; many false positives - lll # common sense is much better than these sort of rules diff --git a/objectstored/blob.go b/objectstored/blob.go index c9733e0a..26584ce5 100644 --- a/objectstored/blob.go +++ b/objectstored/blob.go @@ -25,7 +25,7 @@ func (stored *StoredBlob) ID() objectid.ObjectID { } // Object returns the parsed blob as the generic object interface. -func (stored *StoredBlob) Object() object.Object { //nolint:ireturn +func (stored *StoredBlob) Object() object.Object { return stored.blob } diff --git a/objectstored/commit.go b/objectstored/commit.go index 74016c49..0bcd1e3f 100644 --- a/objectstored/commit.go +++ b/objectstored/commit.go @@ -22,7 +22,7 @@ func (stored *StoredCommit) ID() objectid.ObjectID { } // Object returns the parsed commit as the generic object interface. -func (stored *StoredCommit) Object() object.Object { //nolint:ireturn +func (stored *StoredCommit) Object() object.Object { return stored.commit } diff --git a/objectstored/objectstored.go b/objectstored/objectstored.go index 767d173b..f50b27ee 100644 --- a/objectstored/objectstored.go +++ b/objectstored/objectstored.go @@ -22,7 +22,7 @@ func (stored *StoredTag) ID() objectid.ObjectID { } // Object returns the parsed tag as the generic object interface. -func (stored *StoredTag) Object() object.Object { //nolint:ireturn +func (stored *StoredTag) Object() object.Object { return stored.tag } diff --git a/objectstored/tree.go b/objectstored/tree.go index fd264047..3c6e53de 100644 --- a/objectstored/tree.go +++ b/objectstored/tree.go @@ -22,7 +22,7 @@ func (stored *StoredTree) ID() objectid.ObjectID { } // Object returns the parsed tree as the generic object interface. -func (stored *StoredTree) Object() object.Object { //nolint:ireturn +func (stored *StoredTree) Object() object.Object { return stored.tree } |