From ada7473102ad456072fb2ef01a115cb0adb8d9a8 Mon Sep 17 00:00:00 2001 From: cui fliter Date: Wed, 7 Sep 2022 13:33:51 +0000 Subject: [PATCH] all: remove redundant type conversion Change-Id: Ie059c983bcb3cd6bce7b2097720cbee899abf771 GitHub-Last-Rev: ce456997ea558cceac55ac7732dfcf14ae0b5119 GitHub-Pull-Request: golang/text#33 Reviewed-on: https://go-review.googlesource.com/c/text/+/429059 TryBot-Result: Gopher Robot Reviewed-by: Michael Knyszek Run-TryBot: Cherry Mui Reviewed-by: Cherry Mui --- encoding/internal/enctest/enctest.go | 2 +- internal/ucd/ucd.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/encoding/internal/enctest/enctest.go b/encoding/internal/enctest/enctest.go index cf5da2675..047861629 100644 --- a/encoding/internal/enctest/enctest.go +++ b/encoding/internal/enctest/enctest.go @@ -66,7 +66,7 @@ func TestEncoding(t *testing.T, e encoding.Encoding, encoded, utf8, prefix, suff // regardless of whatever wPrefix is. continue } - got1, want1 := string(g), wPrefix+strings.Repeat(want, n)+wSuffix + got1, want1 := g, wPrefix+strings.Repeat(want, n)+wSuffix if got1 != want1 { t.Fatalf("ReadAll: n=%d\ngot %q\nwant %q", n, trim(got1), trim(want1)) diff --git a/internal/ucd/ucd.go b/internal/ucd/ucd.go index 0879bc84c..13c56c02a 100644 --- a/internal/ucd/ucd.go +++ b/internal/ucd/ucd.go @@ -317,28 +317,28 @@ func (p *Parser) Bool(i int) bool { // Int parses and returns field i as an integer value. func (p *Parser) Int(i int) int { - x, err := strconv.ParseInt(string(p.getField(i)), 10, 64) + x, err := strconv.ParseInt(p.getField(i), 10, 64) p.setError(err, "error parsing int") return int(x) } // Uint parses and returns field i as an unsigned integer value. func (p *Parser) Uint(i int) uint { - x, err := strconv.ParseUint(string(p.getField(i)), 10, 64) + x, err := strconv.ParseUint(p.getField(i), 10, 64) p.setError(err, "error parsing uint") return uint(x) } // Float parses and returns field i as a decimal value. func (p *Parser) Float(i int) float64 { - x, err := strconv.ParseFloat(string(p.getField(i)), 64) + x, err := strconv.ParseFloat(p.getField(i), 64) p.setError(err, "error parsing float") return x } // String parses and returns field i as a string value. func (p *Parser) String(i int) string { - return string(p.getField(i)) + return p.getField(i) } // Strings parses and returns field i as a space-separated list of strings.