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.

5 files changed, 11 insertions, 15 deletions

diff --git a/cmd/btrfs-rec/inspect/rebuildmappings/process.go b/cmd/btrfs-rec/inspect/rebuildmappings/process.go
index cdf5e5a..5f41f15 100644
--- a/cmd/btrfs-rec/inspect/rebuildmappings/process.go
+++ b/cmd/btrfs-rec/inspect/rebuildmappings/process.go
@@ -12,7 +12,6 @@ import (
 
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect"
 	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
 	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
 	"git.lukeshu.com/btrfs-progs-ng/lib/textui"
@@ -26,7 +25,7 @@ func getNodeSize(fs *btrfs.FS) (btrfsvol.AddrDelta, error) {
 	return btrfsvol.AddrDelta(sb.NodeSize), nil
 }
 
-func RebuildMappings(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.ScanDevicesResult) error {
+func RebuildMappings(ctx context.Context, fs *btrfs.FS, scanResults ScanDevicesResult) error {
 	nodeSize, err := getNodeSize(fs)
 	if err != nil {
 		return err
diff --git a/cmd/btrfs-rec/inspect/rebuildmappings/process_blockgroups.go b/cmd/btrfs-rec/inspect/rebuildmappings/process_blockgroups.go
index 0e2d5a0..f8d2337 100644
--- a/cmd/btrfs-rec/inspect/rebuildmappings/process_blockgroups.go
+++ b/cmd/btrfs-rec/inspect/rebuildmappings/process_blockgroups.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2022  Luke Shumaker <lukeshu@lukeshu.com>
+// Copyright (C) 2022-2023  Luke Shumaker <lukeshu@lukeshu.com>
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -9,7 +9,6 @@ import (
 	"sort"
 
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect"
 	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
 	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
 )
@@ -20,7 +19,7 @@ type BlockGroup struct {
 	Flags btrfsvol.BlockGroupFlags
 }
 
-func DedupBlockGroups(scanResults btrfsinspect.ScanDevicesResult) (map[btrfsvol.LogicalAddr]BlockGroup, error) {
+func DedupBlockGroups(scanResults ScanDevicesResult) (map[btrfsvol.LogicalAddr]BlockGroup, error) {
 	// Dedup
 	bgsSet := make(containers.Set[BlockGroup])
 	for _, devResults := range scanResults {
diff --git a/cmd/btrfs-rec/inspect/rebuildmappings/process_sums_logical.go b/cmd/btrfs-rec/inspect/rebuildmappings/process_sums_logical.go
index 7c02d05..2cdabb7 100644
--- a/cmd/btrfs-rec/inspect/rebuildmappings/process_sums_logical.go
+++ b/cmd/btrfs-rec/inspect/rebuildmappings/process_sums_logical.go
@@ -15,13 +15,12 @@ import (
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect"
 	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
 	"git.lukeshu.com/btrfs-progs-ng/lib/slices"
 )
 
-func ExtractLogicalSums(ctx context.Context, scanResults btrfsinspect.ScanDevicesResult) SumRunWithGaps[btrfsvol.LogicalAddr] {
-	var records []btrfsinspect.SysExtentCSum
+func ExtractLogicalSums(ctx context.Context, scanResults ScanDevicesResult) SumRunWithGaps[btrfsvol.LogicalAddr] {
+	var records []SysExtentCSum
 	for _, devResults := range scanResults {
 		records = append(records, devResults.FoundExtentCSums...)
 	}
@@ -53,10 +52,10 @@ func ExtractLogicalSums(ctx context.Context, scanResults btrfsinspect.ScanDevice
 	// "AAAAAAA" shouldn't be present, and if we just discard "BBBBBBBB"
 	// because it conflicts with "CCCCCCC", then we would erroneously
 	// include "AAAAAAA".
-	addrspace := new(containers.RBTree[btrfsinspect.SysExtentCSum])
+	addrspace := new(containers.RBTree[SysExtentCSum])
 	for _, newRecord := range records {
 		for {
-			conflict := addrspace.Search(func(oldRecord btrfsinspect.SysExtentCSum) int {
+			conflict := addrspace.Search(func(oldRecord SysExtentCSum) int {
 				switch {
 				case newRecord.Sums.Addr.Add(newRecord.Sums.Size()) <= oldRecord.Sums.Addr:
 					// 'newRecord' is wholly to the left of 'oldRecord'.
@@ -128,7 +127,7 @@ func ExtractLogicalSums(ctx context.Context, scanResults btrfsinspect.ScanDevice
 			case newRecord.Sums.Addr.Add(newRecord.Sums.Size()) > overlapEnd:
 				suffix = newRecord.Sums.Sums[newOverlapEnd:]
 			}
-			unionRecord := btrfsinspect.SysExtentCSum{
+			unionRecord := SysExtentCSum{
 				Generation: oldRecord.Generation,
 				Sums: btrfsitem.ExtentCSum{
 					SumRun: btrfssum.SumRun[btrfsvol.LogicalAddr]{
@@ -148,7 +147,7 @@ func ExtractLogicalSums(ctx context.Context, scanResults btrfsinspect.ScanDevice
 	var flattened SumRunWithGaps[btrfsvol.LogicalAddr]
 	var curAddr btrfsvol.LogicalAddr
 	var curSums strings.Builder
-	addrspace.Range(func(node *containers.RBNode[btrfsinspect.SysExtentCSum]) bool {
+	addrspace.Range(func(node *containers.RBNode[SysExtentCSum]) bool {
 		curEnd := curAddr + (btrfsvol.LogicalAddr(curSums.Len()/sumSize) * btrfssum.BlockSize)
 		if node.Value.Sums.Addr != curEnd {
 			if curSums.Len() > 0 {
diff --git a/cmd/btrfs-rec/inspect/rebuildmappings/process_sums_physical.go b/cmd/btrfs-rec/inspect/rebuildmappings/process_sums_physical.go
index da22fbf..392ded9 100644
--- a/cmd/btrfs-rec/inspect/rebuildmappings/process_sums_physical.go
+++ b/cmd/btrfs-rec/inspect/rebuildmappings/process_sums_physical.go
@@ -13,11 +13,10 @@ import (
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect"
 	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
 )
 
-func ExtractPhysicalSums(scanResults btrfsinspect.ScanDevicesResult) map[btrfsvol.DeviceID]btrfssum.SumRun[btrfsvol.PhysicalAddr] {
+func ExtractPhysicalSums(scanResults ScanDevicesResult) map[btrfsvol.DeviceID]btrfssum.SumRun[btrfsvol.PhysicalAddr] {
 	ret := make(map[btrfsvol.DeviceID]btrfssum.SumRun[btrfsvol.PhysicalAddr], len(scanResults))
 	for devID, devResults := range scanResults {
 		ret[devID] = devResults.Checksums
diff --git a/cmd/btrfs-rec/inspect/rebuildmappings/scan.go b/cmd/btrfs-rec/inspect/rebuildmappings/scan.go
index d54be71..b67beaf 100644
--- a/cmd/btrfs-rec/inspect/rebuildmappings/scan.go
+++ b/cmd/btrfs-rec/inspect/rebuildmappings/scan.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-package btrfsinspect
+package rebuildmappings
 
 import (
 	"context"