From cab32ead2291fdbe5f5c284c71a693705533c700 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 2 Jan 2021 23:25:43 -0500 Subject: [PATCH] Use more explicit int-to-string conversion. This fixes the following errors with Go 1.15: ``` src/options.go:452:69: conversion from untyped int to string yields a string of one rune, not a string of digits (did you mean fmt.Sprint(x)?) src/options.go:463:33: conversion from untyped int to string yields a string of one rune, not a string of digits (did you mean fmt.Sprint(x)?) ``` Signed-off-by: Elliott Sales de Andrade --- src/options.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/options.go b/src/options.go index 12c0955..cee11ff 100644 --- a/src/options.go +++ b/src/options.go @@ -449,7 +449,7 @@ func parseKeyChords(str string, message string) map[tui.Event]string { errorExit(message) } - str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string(escapedComma)) + str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string([]rune{escapedComma})) tokens := strings.Split(str, ",") if str == "," || strings.HasPrefix(str, ",,") || strings.HasSuffix(str, ",,") || strings.Contains(str, ",,,") { tokens = append(tokens, ",") @@ -460,7 +460,7 @@ func parseKeyChords(str string, message string) map[tui.Event]string { if len(key) == 0 { continue // ignore } - key = strings.ReplaceAll(key, string(escapedComma), ",") + key = strings.ReplaceAll(key, string([]rune{escapedComma}), ",") lkey := strings.ToLower(key) add := func(e tui.EventType) { chords[e.AsEvent()] = key -- 2.29.2