From 273890421b31aa7b43d778e4da3de16659e77d73 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Wed, 17 Aug 2022 20:26:52 -0600
Subject: tools: Upgrade to Go 1.19

 1. Edit Makefile:goversion
 2. Run `make go-mod-tidy`
 3. Run `gofmt -s -w .`
 4. Look at the ignore-whitespace-change diff and fixup band gofmt changes
---
 lib/btrfs/btrfsitem/item_dir.go |  4 +--
 lib/btrfs/io3_btree.go          | 80 ++++++++++++++++++++---------------------
 2 files changed, 42 insertions(+), 42 deletions(-)

(limited to 'lib/btrfs')

diff --git a/lib/btrfs/btrfsitem/item_dir.go b/lib/btrfs/btrfsitem/item_dir.go
index 2fb2d41..9df1b8d 100644
--- a/lib/btrfs/btrfsitem/item_dir.go
+++ b/lib/btrfs/btrfsitem/item_dir.go
@@ -21,8 +21,8 @@ func NameHash(dat []byte) uint64 {
 
 // key.objectid = inode of directory containing this entry
 // key.offset =
-//    for DIR_ITEM and XATTR_ITEM = NameHash(name)
-//    for DIR_INDEX               = index id in the directory (starting at 2, because "." and "..")
+//   - for DIR_ITEM and XATTR_ITEM = NameHash(name)
+//   - for DIR_INDEX               = index id in the directory (starting at 2, because "." and "..")
 type DirEntry struct { // DIR_ITEM=84 DIR_INDEX=96 XATTR_ITEM=24
 	Location      internal.Key `bin:"off=0x0, siz=0x11"`
 	TransID       int64        `bin:"off=0x11, siz=8"`
diff --git a/lib/btrfs/io3_btree.go b/lib/btrfs/io3_btree.go
index 73f9804..2efef89 100644
--- a/lib/btrfs/io3_btree.go
+++ b/lib/btrfs/io3_btree.go
@@ -66,52 +66,52 @@ var _ Trees = (*FS)(nil)
 
 // - The first element will always have an ItemIdx of -1.
 //
-// - For .Item() callbacks, the last element will always have a
-//   NodeAddr of 0.
+//   - For .Item() callbacks, the last element will always have a
+//     NodeAddr of 0.
 //
 // For example, given the tree structure
 //
-//   [superblock]
-//        |
-//        | <------------------------------------------ pathElem={idx:-1, addr:0x01, lvl:3}
-//        |
-//     +[0x01]-----------+
-//     | lvl=3           |
-//     +-+-+-+-+-+-+-+-+-+
-//     |1|2|3|4|5|6|7|8|9|
-//     +---+---+---+---+-+
-//                    |
-//                    | <------------------------------ pathElem={idx:8, addr:0x02, lvl:2}
-//                    |
-//                 +[0x02]-----------+
-//                 | lvl=2           |
-//                 +-+-+-+-+-+-+-+-+-+
-//                 |1|2|3|4|5|6|7|8|9|
-//                 +---+---+---+---+-+
-//                              |
-//                              | <-------------------- pathElem={idx:7, addr:0x03, lvl:1}
-//                              |
-//                           +[0x03]-----------+
-//                           | lvl=1           |
-//                           +-+-+-+-+-+-+-+-+-+
-//                           |1|2|3|4|5|6|7|8|9|
-//                           +---+---+---+---+-+
-//                                  |
-//                                  | <---------------- pathElem={idx:4, addr:0x04, lvl:0}
-//                                  |
-//                                +[0x04]-----------+
-//                                | lvl=0           |
-//                                +-+-+-+-+-+-+-+-+-+
-//                                |1|2|3|4|5|6|7|8|9|
-//                                +---+---+---+---+-+
-//                                   |
-//                                   | <--------------- pathElem={idx:5, addr:0, lvl:0}
-//                                   |
-//                                 [item]
+//	[superblock]
+//	     |
+//	     | <------------------------------------------ pathElem={idx:-1, addr:0x01, lvl:3}
+//	     |
+//	  +[0x01]-----------+
+//	  | lvl=3           |
+//	  +-+-+-+-+-+-+-+-+-+
+//	  |1|2|3|4|5|6|7|8|9|
+//	  +---+---+---+---+-+
+//	                 |
+//	                 | <------------------------------ pathElem={idx:8, addr:0x02, lvl:2}
+//	                 |
+//	              +[0x02]-----------+
+//	              | lvl=2           |
+//	              +-+-+-+-+-+-+-+-+-+
+//	              |1|2|3|4|5|6|7|8|9|
+//	              +---+---+---+---+-+
+//	                           |
+//	                           | <-------------------- pathElem={idx:7, addr:0x03, lvl:1}
+//	                           |
+//	                        +[0x03]-----------+
+//	                        | lvl=1           |
+//	                        +-+-+-+-+-+-+-+-+-+
+//	                        |1|2|3|4|5|6|7|8|9|
+//	                        +---+---+---+---+-+
+//	                               |
+//	                               | <---------------- pathElem={idx:4, addr:0x04, lvl:0}
+//	                               |
+//	                             +[0x04]-----------+
+//	                             | lvl=0           |
+//	                             +-+-+-+-+-+-+-+-+-+
+//	                             |1|2|3|4|5|6|7|8|9|
+//	                             +---+---+---+---+-+
+//	                                |
+//	                                | <--------------- pathElem={idx:5, addr:0, lvl:0}
+//	                                |
+//	                              [item]
 //
 // the path would be
 //
-//     {-1, 0x01, 3}→{8, 0x02, 2}→{7, 0x03, 1}→{4, 0x04, 0}→{2, 0, 0}
+//	{-1, 0x01, 3}→{8, 0x02, 2}→{7, 0x03, 1}→{4, 0x04, 0}→{2, 0, 0}
 type TreePath struct {
 	TreeID ObjID
 	Nodes  []TreePathElem
-- 
cgit v1.2.3-2-g168b