Get it to compile with the renamed files

    #!/bin/bash
    set -e

    git ls-files :*.go :!tools/| while read -r file; do
    	pkgname=${file%/*.go}
    	pkgname=${pkgname##*/}
    	if [[ "$pkgname" == btrfs-rec ]]; then
    		pkgname=main
    	fi
    	sed -i "s/^package [^_]*/package ${pkgname}/" "$file"
    done

    # btrfsutil ####################################################################

    gofmt -w -r 'rebuildnodes -> rebuildtrees' cmd lib
    gofmt -w -r 'btrees       -> btrfsutil'    cmd lib
    gofmt -w -r 'keyio        -> btrfsutil'    cmd lib

    sed -i 's/func New/func NewGraph/' lib/btrfsutil/graph.go
    gofmt -w -r 'graph.New   -> btrfsutil.NewGraph' cmd lib
    gofmt -w -r 'graph.Graph -> btrfsutil.Graph'    cmd lib
    sed -i -e '/\/graph"/d' -e 's/pkggraph\.//' lib/btrfsutil/rebuilt_forrest.go

    gofmt -w -r 'btrfsutil.BrokenForrest -> BrokenForrest ' lib/btrfsutil
    gofmt -w -r 'btrfsutil.Handle        -> Handle        ' lib/btrfsutil
    gofmt -w -r 'btrfsutil.Graph         -> Graph         ' lib/btrfsutil
    gofmt -w -r 'btrfsutil.ItemPtr       -> ItemPtr       ' lib/btrfsutil

    gofmt -w -r 'Handle -> KeyIO' lib/btrfsutil
    gofmt -w -r 'btrfsutil.Handle -> btrfsutil.KeyIO' cmd/btrfs-rec/inspect/rebuildtrees/
    gofmt -w -r 'NewHandle -> NewKeyIO' cmd lib

    # rebuildmappings ##############################################################

    gofmt -w -r 'btrfsinspect.DumpTrees         -> dumptrees.DumpTrees'               cmd lib
    gofmt -w -r 'btrfsinspect.MountRO           -> mount.MountRO'                     cmd lib
    gofmt -w -r 'btrfsinspect.ScanDevices       -> rebuildmappings.ScanDevices'       cmd lib
    gofmt -w -r 'btrfsinspect.ScanDevicesResult -> rebuildmappings.ScanDevicesResult' cmd lib
    gofmt -w -r 'btrfsinspect.SysExtentCSum     -> rebuildmappings.SysExtentCSum'     cmd lib

    gofmt -w -r 'rebuildmappings.IndexAll          -> IndexAll          ' cmd/btrfs-rec/inspect/rebuildmappings
    gofmt -w -r 'rebuildmappings.ScanDevicesResult -> ScanDevicesResult ' cmd/btrfs-rec/inspect/rebuildmappings
    gofmt -w -r 'rebuildmappings.SysExtentCSum     -> SysExtentCSum     ' cmd/btrfs-rec/inspect/rebuildmappings

    # btrfscheck ###################################################################

    sed -i -e 's/func handle/func Handle/' lib/btrfscheck/graph.go
    sed -i 's/handle/btrfscheck.Handle/g' cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go
    gofmt -w -r 'fsErr        -> FSErr        ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
    gofmt -w -r 'want         -> Want         ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
    gofmt -w -r 'wantOff      -> WantOff      ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
    gofmt -w -r 'wantDirIndex -> WantDirIndex ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
    gofmt -w -r 'wantCSum     -> WantCSum     ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
    gofmt -w -r 'wantFileExt  -> WantFileExt  ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees

    # generic imports ##############################################################

    replace() {
    	git grep -l "$1"|xargs -r sed -i "s,$1,$2,g"
    }

    replace 'lib/btrfsprogs/btrfsinspect/rebuildmappings"' 'cmd/btrfs-rec/inspect/rebuildmappings"'
    replace 'lib/btrfsprogs/btrfsinspect/rebuildnodes"'    'cmd/btrfs-rec/inspect/rebuildtrees"'
    replace 'lib/btrfsprogs/btrfsutil"'                    'lib/btrfsutil"'
    goimports -w cmd lib
    ./tools/bin/golangci-lint run --fix ./...

And then touch-up copyright statements by hand.

1 files changed, 7 insertions, 8 deletions

diff --git a/lib/btrfsutil/rebuilt_tree.go b/lib/btrfsutil/rebuilt_tree.go
index 39d8871..e61b45b 100644
--- a/lib/btrfsutil/rebuilt_tree.go
+++ b/lib/btrfsutil/rebuilt_tree.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-package btrees
+package btrfsutil
 
 import (
 	"context"
@@ -15,7 +15,6 @@ import (
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsprim"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildnodes/keyio"
 	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
 	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
 	"git.lukeshu.com/btrfs-progs-ng/lib/slices"
@@ -136,7 +135,7 @@ func (tree *RebuiltTree) isOwnerOK(owner btrfsprim.ObjID, gen btrfsprim.Generati
 //
 // Do not mutate the returned map; it is a pointer to the
 // RebuiltTree's internal map!
-func (tree *RebuiltTree) Items(ctx context.Context) *containers.SortedMap[btrfsprim.Key, keyio.ItemPtr] {
+func (tree *RebuiltTree) Items(ctx context.Context) *containers.SortedMap[btrfsprim.Key, ItemPtr] {
 	ctx = dlog.WithField(ctx, "btrfsinspect.rebuild-nodes.rebuild.index-inc-items", fmt.Sprintf("tree=%v", tree.ID))
 	return tree.items(ctx, &tree.forrest.incItems, tree.Roots.HasAny)
 }
@@ -146,7 +145,7 @@ func (tree *RebuiltTree) Items(ctx context.Context) *containers.SortedMap[btrfsp
 //
 // Do not mutate the returned map; it is a pointer to the
 // RebuiltTree's internal map!
-func (tree *RebuiltTree) PotentialItems(ctx context.Context) *containers.SortedMap[btrfsprim.Key, keyio.ItemPtr] {
+func (tree *RebuiltTree) PotentialItems(ctx context.Context) *containers.SortedMap[btrfsprim.Key, ItemPtr] {
 	ctx = dlog.WithField(ctx, "btrfsinspect.rebuild-nodes.rebuild.index-exc-items", fmt.Sprintf("tree=%v", tree.ID))
 	return tree.items(ctx, &tree.forrest.excItems,
 		func(roots containers.Set[btrfsvol.LogicalAddr]) bool {
@@ -154,7 +153,7 @@ func (tree *RebuiltTree) PotentialItems(ctx context.Context) *containers.SortedM
 		})
 }
 
-type itemIndex = containers.SortedMap[btrfsprim.Key, keyio.ItemPtr]
+type itemIndex = containers.SortedMap[btrfsprim.Key, ItemPtr]
 
 type itemStats struct {
 	Leafs    textui.Portion[int]
@@ -169,7 +168,7 @@ func (s itemStats) String() string {
 
 func (tree *RebuiltTree) items(ctx context.Context, cache containers.Map[btrfsprim.ObjID, *itemIndex],
 	leafFn func(roots containers.Set[btrfsvol.LogicalAddr]) bool,
-) *containers.SortedMap[btrfsprim.Key, keyio.ItemPtr] {
+) *containers.SortedMap[btrfsprim.Key, ItemPtr] {
 	tree.mu.RLock()
 	defer tree.mu.RUnlock()
 
@@ -186,12 +185,12 @@ func (tree *RebuiltTree) items(ctx context.Context, cache containers.Map[btrfspr
 		stats.Leafs.D = len(leafs)
 		progressWriter := textui.NewProgress[itemStats](ctx, dlog.LogLevelInfo, textui.Tunable(1*time.Second))
 
-		index := new(containers.SortedMap[btrfsprim.Key, keyio.ItemPtr])
+		index := new(containers.SortedMap[btrfsprim.Key, ItemPtr])
 		for i, leaf := range leafs {
 			stats.Leafs.N = i
 			progressWriter.Set(stats)
 			for j, itemKey := range tree.forrest.graph.Nodes[leaf].Items {
-				newPtr := keyio.ItemPtr{
+				newPtr := ItemPtr{
 					Node: leaf,
 					Idx:  j,
 				}