remove nolint comments

thaJeztah · thaJeztah · commit b0b25847ac87 · 2025-12-05T13:13:59.000+01:00
There only were a few, and most could be addressed by suppressing the
unhandled errors.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/zfs.go b/zfs.go
@@ -107,7 +107,7 @@ func (s *snapshotter) Stat(ctx context.Context, key string) (snapshots.Info, err
 	if err != nil {
 		return snapshots.Info{}, err
 	}
-	defer t.Rollback() //nolint:errcheck
+	defer func() { _ = t.Rollback() }()
 	_, info, _, err := storage.GetInfo(ctx, key)
 	if err != nil {
 		return snapshots.Info{}, err
@@ -127,7 +127,7 @@ func (s *snapshotter) usage(ctx context.Context, key string) (snapshots.Usage, e
 		return snapshots.Usage{}, err
 	}
 	id, info, usage, err := storage.GetInfo(ctx, key)
-	t.Rollback() //nolint:errcheck
+	_ = t.Rollback()
 
 	if err != nil {
 		return snapshots.Usage{}, err
@@ -159,7 +159,7 @@ func (s *snapshotter) Walk(ctx context.Context, fn snapshots.WalkFunc, filters .
 	if err != nil {
 		return err
 	}
-	defer t.Rollback() //nolint:errcheck
+	defer func() { _ = t.Rollback() }()
 	return storage.WalkInfo(ctx, fn, filters...)
 }
 
@@ -288,7 +288,7 @@ func (s *snapshotter) Mounts(ctx context.Context, key string) ([]mount.Mount, er
 		return nil, err
 	}
 	snapshot, err := storage.GetSnapshot(ctx, key)
-	t.Rollback() //nolint:errcheck
+	_ = t.Rollback()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get active snapshot: %w", err)
 	}
@@ -352,7 +352,7 @@ func (s *snapshotter) Update(ctx context.Context, info snapshots.Info, fieldpath
 
 	info, err = storage.UpdateInfo(ctx, info, fieldpaths...)
 	if err != nil {
-		t.Rollback() //nolint:errcheck
+		_ = t.Rollback()
 		return snapshots.Info{}, err
 	}
 
diff --git a/zfs_test.go b/zfs_test.go
@@ -108,7 +108,7 @@ func TestZFSUsage(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	defer closer() //nolint:errcheck
+	defer func() { _ = closer() }()
 
 	// Prepare empty base layer
 	target := filepath.Join(root, "prepare-1")

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (s *snapshotter) Stat(ctx context.Context, key string) (snapshots.Info, err`
`107`	`107`	`if err != nil {`
`108`	`108`	`return snapshots.Info{}, err`
`109`	`109`	`}`
`110`		`- defer t.Rollback() //nolint:errcheck`
	`110`	`+ defer func() { _ = t.Rollback() }()`
`111`	`111`	`_, info, _, err := storage.GetInfo(ctx, key)`
`112`	`112`	`if err != nil {`
`113`	`113`	`return snapshots.Info{}, err`
`@@ -127,7 +127,7 @@ func (s *snapshotter) usage(ctx context.Context, key string) (snapshots.Usage, e`
`127`	`127`	`return snapshots.Usage{}, err`
`128`	`128`	`}`
`129`	`129`	`id, info, usage, err := storage.GetInfo(ctx, key)`
`130`		`- t.Rollback() //nolint:errcheck`
	`130`	`+ _ = t.Rollback()`
`131`	`131`
`132`	`132`	`if err != nil {`
`133`	`133`	`return snapshots.Usage{}, err`
`@@ -159,7 +159,7 @@ func (s *snapshotter) Walk(ctx context.Context, fn snapshots.WalkFunc, filters .`
`159`	`159`	`if err != nil {`
`160`	`160`	`return err`
`161`	`161`	`}`
`162`		`- defer t.Rollback() //nolint:errcheck`
	`162`	`+ defer func() { _ = t.Rollback() }()`
`163`	`163`	`return storage.WalkInfo(ctx, fn, filters...)`
`164`	`164`	`}`
`165`	`165`
`@@ -288,7 +288,7 @@ func (s *snapshotter) Mounts(ctx context.Context, key string) ([]mount.Mount, er`
`288`	`288`	`return nil, err`
`289`	`289`	`}`
`290`	`290`	`snapshot, err := storage.GetSnapshot(ctx, key)`
`291`		`- t.Rollback() //nolint:errcheck`
	`291`	`+ _ = t.Rollback()`
`292`	`292`	`if err != nil {`
`293`	`293`	`return nil, fmt.Errorf("failed to get active snapshot: %w", err)`
`294`	`294`	`}`
`@@ -352,7 +352,7 @@ func (s *snapshotter) Update(ctx context.Context, info snapshots.Info, fieldpath`
`352`	`352`
`353`	`353`	`info, err = storage.UpdateInfo(ctx, info, fieldpaths...)`
`354`	`354`	`if err != nil {`
`355`		`- t.Rollback() //nolint:errcheck`
	`355`	`+ _ = t.Rollback()`
`356`	`356`	`return snapshots.Info{}, err`
`357`	`357`	`}`
`358`	`358`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func TestZFSUsage(t *testing.T) {`
`108`	`108`	`if err != nil {`
`109`	`109`	`t.Error(err)`
`110`	`110`	`}`
`111`		`- defer closer() //nolint:errcheck`
	`111`	`+ defer func() { _ = closer() }()`
`112`	`112`
`113`	`113`	`// Prepare empty base layer`
`114`	`114`	`target := filepath.Join(root, "prepare-1")`