diff --git a/cmd/restic/progress.go b/cmd/restic/progress.go index afd5d027f..6f1626772 100644 --- a/cmd/restic/progress.go +++ b/cmd/restic/progress.go @@ -82,10 +82,10 @@ func printProgress(status string, final bool) { } } - var carriageControl, clear string + var carriageControl, cl string if canUpdateStatus { - clear = clearLine(w) + cl = clearLine(w) } if !(strings.HasSuffix(status, "\r") || strings.HasSuffix(status, "\n")) { @@ -96,7 +96,7 @@ func printProgress(status string, final bool) { } } - _, _ = os.Stdout.Write([]byte(clear + status + carriageControl)) + _, _ = os.Stdout.Write([]byte(cl + status + carriageControl)) if final { _, _ = os.Stdout.Write([]byte("\n")) } diff --git a/internal/backend/azure/azure.go b/internal/backend/azure/azure.go index b2ef7ec30..87dc1eaaf 100644 --- a/internal/backend/azure/azure.go +++ b/internal/backend/azure/azure.go @@ -421,10 +421,10 @@ func (be *Backend) List(ctx context.Context, t backend.FileType, fn func(backend prefix += "/" } - max := int32(be.listMaxItems) + maxI := int32(be.listMaxItems) opts := &azContainer.ListBlobsFlatOptions{ - MaxResults: &max, + MaxResults: &maxI, Prefix: &prefix, } lister := be.container.NewListBlobsFlatPager(opts) diff --git a/internal/backend/shell_split.go b/internal/backend/shell_split.go index 888c993a0..b92300ba9 100644 --- a/internal/backend/shell_split.go +++ b/internal/backend/shell_split.go @@ -47,8 +47,8 @@ func SplitShellStrings(data string) (strs []string, err error) { // derived from strings.SplitFunc fieldStart := -1 // Set to -1 when looking for start of field. - for i, rune := range data { - if s.isSplitChar(rune) { + for i, r := range data { + if s.isSplitChar(r) { if fieldStart >= 0 { strs = append(strs, data[fieldStart:i]) fieldStart = -1 diff --git a/internal/ui/format.go b/internal/ui/format.go index de650607d..fa50fb682 100644 --- a/internal/ui/format.go +++ b/internal/ui/format.go @@ -53,12 +53,12 @@ func FormatDuration(d time.Duration) string { func FormatSeconds(sec uint64) string { hours := sec / 3600 sec -= hours * 3600 - min := sec / 60 - sec -= min * 60 + mins := sec / 60 + sec -= mins * 60 if hours > 0 { - return fmt.Sprintf("%d:%02d:%02d", hours, min, sec) + return fmt.Sprintf("%d:%02d:%02d", hours, mins, sec) } - return fmt.Sprintf("%d:%02d", min, sec) + return fmt.Sprintf("%d:%02d", mins, sec) } // ParseBytes parses a size in bytes from s. It understands the suffixes diff --git a/internal/ui/progress/counter.go b/internal/ui/progress/counter.go index c1275d2f2..ac2e519a7 100644 --- a/internal/ui/progress/counter.go +++ b/internal/ui/progress/counter.go @@ -29,8 +29,8 @@ func NewCounter(interval time.Duration, total uint64, report Func) *Counter { max: total, } c.Updater = *NewUpdater(interval, func(runtime time.Duration, final bool) { - v, max := c.Get() - report(v, max, runtime, final) + v, maxV := c.Get() + report(v, maxV, runtime, final) }) return c } diff --git a/internal/ui/termstatus/status_test.go b/internal/ui/termstatus/status_test.go index 2a17a905a..b4e9be5b0 100644 --- a/internal/ui/termstatus/status_test.go +++ b/internal/ui/termstatus/status_test.go @@ -24,34 +24,34 @@ func TestSetStatus(t *testing.T) { go term.Run(ctx) const ( - clear = posixControlClearLine - home = posixControlMoveCursorHome - up = posixControlMoveCursorUp + cl = posixControlClearLine + home = posixControlMoveCursorHome + up = posixControlMoveCursorUp ) term.SetStatus([]string{"first"}) - exp := home + clear + "first" + home + exp := home + cl + "first" + home term.SetStatus([]string{""}) - exp += home + clear + "" + home + exp += home + cl + "" + home term.SetStatus([]string{}) - exp += home + clear + "" + home + exp += home + cl + "" + home // already empty status term.SetStatus([]string{}) term.SetStatus([]string{"foo", "bar", "baz"}) - exp += home + clear + "foo\n" + home + clear + "bar\n" + - home + clear + "baz" + home + up + up + exp += home + cl + "foo\n" + home + cl + "bar\n" + + home + cl + "baz" + home + up + up term.SetStatus([]string{"quux", "needs\nquote"}) - exp += home + clear + "quux\n" + - home + clear + "\"needs\\nquote\"\n" + - home + clear + home + up + up // Clear third line + exp += home + cl + "quux\n" + + home + cl + "\"needs\\nquote\"\n" + + home + cl + home + up + up // Clear third line cancel() - exp += home + clear + "\n" + home + clear + home + up // Status cleared + exp += home + cl + "\n" + home + cl + home + up // Status cleared <-term.closed rtest.Equals(t, exp, buf.String())