aboutsummaryrefslogtreecommitdiffstats
path: root/community/fzf/use-explicit-int-to-string-conversion.patch
blob: 7393f20a8149db050a17a1336d2370d7204df7d7 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
From cab32ead2291fdbe5f5c284c71a693705533c700 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
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)?)
```
---
 src/options.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/options.go b/src/options.go
index 12c09556..cee11ffc 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