From 952b677bf7f10da93673e3671f764c54c454bbfe Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 13 Jul 2022 20:41:10 -0600 Subject: Move ordered.go to lib/containers Something about this trips a stack overflow in golangci-lint, so upgrade golangci-lint to a commit that fixes this. --- lib/btrfs/internal/misc.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/btrfs/internal') diff --git a/lib/btrfs/internal/misc.go b/lib/btrfs/internal/misc.go index 49fe2bd..eb5c287 100644 --- a/lib/btrfs/internal/misc.go +++ b/lib/btrfs/internal/misc.go @@ -9,7 +9,7 @@ import ( "time" "git.lukeshu.com/btrfs-progs-ng/lib/binstruct" - "git.lukeshu.com/btrfs-progs-ng/lib/util" + "git.lukeshu.com/btrfs-progs-ng/lib/containers" ) type Generation uint64 @@ -26,13 +26,13 @@ func (k Key) String() string { } func (a Key) Cmp(b Key) int { - if d := util.CmpUint(a.ObjectID, b.ObjectID); d != 0 { + if d := containers.CmpUint(a.ObjectID, b.ObjectID); d != 0 { return d } - if d := util.CmpUint(a.ItemType, b.ItemType); d != 0 { + if d := containers.CmpUint(a.ItemType, b.ItemType); d != 0 { return d } - return util.CmpUint(a.Offset, b.Offset) + return containers.CmpUint(a.Offset, b.Offset) } type Time struct { -- cgit v1.2.3-2-g168b