Use Go 1.24

diff --git a/diff.go b/diff.go
index 0ab2859cc27d2123dbfd00063e3d48f8efa712c8fa101f6248cff268b39cbe34..fcbd08a2185245514d4e0871da192cc6d6713e49cfa604f44fb0f727538eab48 100644 (file)
--- a/diff.go
+++ b/diff.go
@@ -20,6 +20,7 @@ import (
        "io"
        "log"
        "os"
        "io"
        "log"
        "os"

+       "slices"

        "sort"
        "strings"
 )
        "sort"
        "strings"
 )


@@ -133,10 +134,7 @@ func updateWithDiff(dbPath, strip string) *os.File {
                        if len(rens) > 0 {
                                if hasPrefix(ent.name, rens[0].src) {
                                        dels = append(dels, ent.name)
                        if len(rens) > 0 {
                                if hasPrefix(ent.name, rens[0].src) {
                                        dels = append(dels, ent.name)

-                                       dst := append(
-                                               append([]string{}, rens[0].dst...),
-                                               ent.name[len(rens[0].src):]...,
-                                       )
+                                       dst := slices.Concat(rens[0].dst, ent.name[len(rens[0].src):])

                                        adds = append(adds, dst)
                                        mods = append(mods, &Ent{name: dst})
                                        if !met {
                                        adds = append(adds, dst)
                                        mods = append(mods, &Ent{name: dst})
                                        if !met {

diff --git a/go.mod b/go.mod
index aa84d7d0799772daaba15193cf3c51821198a85119bad0974b255728328cd394..cb3a7163f6b32ff5dd548091a43493f656704a68cdb08f233ab9596c99caec71 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module go.stargrave.org/glocate
 
 module go.stargrave.org/glocate
 

-go 1.22.4
+go 1.24

 
 require (
        github.com/dustin/go-humanize v1.0.1
 
 require (
        github.com/dustin/go-humanize v1.0.1

diff --git a/main.go b/main.go
index 242bbdfa0c330f2951085ee793aab42b15f924638d5c439a8066c53409a088e5..6eaa19f7058e688bdfdc6bc309392c0997f50ee522ae0ad6fcd911b16299b7be 100644 (file)
--- a/main.go
+++ b/main.go
@@ -125,7 +125,7 @@ func main() {
                                entsPrinter <- ent
                                continue
                        }
                                entsPrinter <- ent
                                continue
                        }

-                       for i = 0; i < len(ent.name); i++ {
+                       for i = range len(ent.name) {

                                if i == len(namePrev) || ent.name[i] != namePrev[i] {
                                        break
                                }
                                if i == len(namePrev) || ent.name[i] != namePrev[i] {
                                        break
                                }

diff --git a/names.go b/names.go
index 94326b788ebe3a3e250a5b9d7c8322093a106609aab744e6e7261a75296120a1..6f397319d530a780c21e8bc9dfdce6e29767adfc505eb000c3e07c1432b65fda 100644 (file)
--- a/names.go
+++ b/names.go
@@ -63,7 +63,7 @@ func namesCmp(n1, n2 []string) int {
                min = len(n2)
        }
        var t1, t2 string
                min = len(n2)
        }
        var t1, t2 string

-       for i := 0; i < min; i++ {
+       for i := range min {

                t1 = strings.TrimSuffix(n1[i], "/")
                t2 = strings.TrimSuffix(n2[i], "/")
                if t1 < t2 {
                t1 = strings.TrimSuffix(n1[i], "/")
                t2 = strings.TrimSuffix(n2[i], "/")
                if t1 < t2 {

diff --git a/reader.go b/reader.go
index f8f5e188145584684c60eeb8e7f72c5c530ead50df851405c95bf55d66314b30..67db978168d7cc734482dfa7a468230f203a890d4ffd2e0070391db4b80471c4 100644 (file)
--- a/reader.go
+++ b/reader.go
@@ -20,6 +20,7 @@ import (
        "encoding/binary"
        "io"
        "log"
        "encoding/binary"
        "io"
        "log"

+       "slices"

 
        "github.com/klauspost/compress/zstd"
 )
 
        "github.com/klauspost/compress/zstd"
 )


@@ -65,7 +66,7 @@ func reader(src io.Reader, sink chan Ent) {
                } else if depth < depthPrev {
                        cols = cols[:len(cols)-int(depthPrev-depth)]
                }
                } else if depth < depthPrev {
                        cols = cols[:len(cols)-int(depthPrev-depth)]
                }

-               ent.name = append([]string{}, append(cols, name)...)
+               ent.name = slices.Clone(append(cols, name))

                sink <- ent
                namePrev = name
                depthPrev = depth
                sink <- ent
                namePrev = name
                depthPrev = depth

diff --git a/walker.go b/walker.go
index 4d6b8794fc0bc04050ba816634e7e41ea89dce35bad35259a61e7469ce4e58a4..190a54b9cb3d5a442854819563bf24ee1c89ae5cddd3acfa6fecd87aaddb6ece 100644 (file)
--- a/walker.go
+++ b/walker.go
@@ -20,6 +20,7 @@ import (
        "log"
        "os"
        "path"
        "log"
        "os"
        "path"

+       "slices"

 )
 
 var (
 )
 
 var (


@@ -35,7 +36,7 @@ func walker(sink chan Ent, root []string) error {
        var info fs.FileInfo
        ents := make([]Ent, 0, len(files))
        for _, file := range files {
        var info fs.FileInfo
        ents := make([]Ent, 0, len(files))
        for _, file := range files {

-               ent := Ent{name: append([]string{}, append(root, file.Name())...)}
+               ent := Ent{name: slices.Clone(append(root, file.Name()))}

                info, err = file.Info()
                if err == nil {
                        if info.IsDir() {
                info, err = file.Info()
                if err == nil {
                        if info.IsDir() {