mirror of
https://github.com/rclone/rclone.git
synced 2026-01-04 17:43:50 +00:00
build: modernize Go usage
This commit modernizes Go usage. This was done with:
go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...
Then files needed to be `go fmt`ed and a few comments needed to be
restored.
The modernizations include replacing
- if/else conditional assignment by a call to the built-in min or max functions added in go1.21
- sort.Slice(x, func(i, j int) bool) { return s[i] < s[j] } by a call to slices.Sort(s), added in go1.21
- interface{} by the 'any' type added in go1.18
- append([]T(nil), s...) by slices.Clone(s) or slices.Concat(s), added in go1.21
- loop around an m[k]=v map update by a call to one of the Collect, Copy, Clone, or Insert functions from the maps package, added in go1.21
- []byte(fmt.Sprintf...) by fmt.Appendf(nil, ...), added in go1.19
- append(s[:i], s[i+1]...) by slices.Delete(s, i, i+1), added in go1.21
- a 3-clause for i := 0; i < n; i++ {} loop by for i := range n {}, added in go1.22
This commit is contained in:
@@ -627,7 +627,7 @@ func (b *bisyncTest) runTestStep(ctx context.Context, line string) (err error) {
|
||||
testFunc := func() {
|
||||
src := filepath.Join(b.dataDir, "file7.txt")
|
||||
|
||||
for i := 0; i < 50; i++ {
|
||||
for i := range 50 {
|
||||
dst := "file" + fmt.Sprint(i) + ".txt"
|
||||
err := b.copyFile(ctx, src, b.replaceHex(b.path2), dst)
|
||||
if err != nil {
|
||||
@@ -1606,7 +1606,7 @@ func (b *bisyncTest) mangleResult(dir, file string, golden bool) string {
|
||||
s = pathReplacer.Replace(strings.TrimSpace(s))
|
||||
|
||||
// Apply regular expression replacements
|
||||
for i := 0; i < len(repFrom); i++ {
|
||||
for i := range repFrom {
|
||||
s = repFrom[i].ReplaceAllString(s, repTo[i])
|
||||
}
|
||||
s = strings.TrimSpace(s)
|
||||
@@ -1621,7 +1621,7 @@ func (b *bisyncTest) mangleResult(dir, file string, golden bool) string {
|
||||
// Sort consecutive groups of naturally unordered lines.
|
||||
// Any such group must end before the log ends or it might be lost.
|
||||
absorbed := false
|
||||
for i := 0; i < len(dampers); i++ {
|
||||
for i := range dampers {
|
||||
match := false
|
||||
if s != "" && !absorbed {
|
||||
match = hoppers[i].MatchString(s)
|
||||
@@ -1869,7 +1869,7 @@ func fileType(fileName string) string {
|
||||
}
|
||||
|
||||
// logPrintf prints a message to stdout and to the test log
|
||||
func (b *bisyncTest) logPrintf(text string, args ...interface{}) {
|
||||
func (b *bisyncTest) logPrintf(text string, args ...any) {
|
||||
line := fmt.Sprintf(text, args...)
|
||||
fs.Log(nil, line)
|
||||
if b.logFile != nil {
|
||||
@@ -1936,7 +1936,7 @@ func ctxNoDsStore(ctx context.Context, t *testing.T) (context.Context, *filter.F
|
||||
return ctxNoDsStore, fi
|
||||
}
|
||||
|
||||
func checkError(t *testing.T, err error, msgAndArgs ...interface{}) {
|
||||
func checkError(t *testing.T, err error, msgAndArgs ...any) {
|
||||
if errors.Is(err, fs.ErrorCantUploadEmptyFiles) {
|
||||
t.Skipf("Skip test because remote cannot upload empty files")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user