Upgrade Go to 1.23 (#3190)
* Upgrade to Golang 1.23rc1 * Fix imports * Go 1.23 final version * Fix lint compatibility with ci-goreleaser
This commit is contained in:
@@ -5,9 +5,8 @@ import (
|
||||
"errors"
|
||||
"io"
|
||||
"io/fs"
|
||||
"maps"
|
||||
"slices"
|
||||
|
||||
"golang.org/x/exp/maps"
|
||||
)
|
||||
|
||||
// FS implements a simple merged fs.FS, that can combine a Base FS with an Overlay FS. The semantics are:
|
||||
@@ -64,9 +63,8 @@ func (m FS) mergeDirs(name string, info fs.FileInfo, baseDir fs.ReadDirFile, ove
|
||||
for _, f := range overlayFiles {
|
||||
merged[f.Name()] = f
|
||||
}
|
||||
entries := maps.Values(merged)
|
||||
|
||||
slices.SortFunc(entries, func(i, j fs.DirEntry) int { return cmp.Compare(i.Name(), j.Name()) })
|
||||
it := maps.Values(merged)
|
||||
entries := slices.SortedFunc(it, func(i, j fs.DirEntry) int { return cmp.Compare(i.Name(), j.Name()) })
|
||||
return &mergedDir{
|
||||
name: name,
|
||||
info: info,
|
||||
|
||||
Reference in New Issue
Block a user