From: Joel Sing <jsing@google.com>
Date: Sun, 11 Dec 2011 17:25:09 +0000 (-0800)
Subject: exp/norm: fix rune/int types in test
X-Git-Tag: weekly.2011-12-14~103
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=7e797be7a3607c294285c8eaa47aed818b76acde;p=gostls13.git

exp/norm: fix rune/int types in test

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5472067
---

diff --git a/src/pkg/exp/norm/normregtest.go b/src/pkg/exp/norm/normregtest.go
index d214ce11bc..eb061eba23 100644
--- a/src/pkg/exp/norm/normregtest.go
+++ b/src/pkg/exp/norm/normregtest.go
@@ -177,7 +177,7 @@ func loadTestData() {
 				}
 				if test.r == 0 {
 					// save for CharacterByCharacterTests
-					test.r = int(r)
+					test.r = rune(r)
 				}
 				var buf [utf8.UTFMax]byte
 				sz := utf8.EncodeRune(buf[:], rune(r))
@@ -242,9 +242,9 @@ func doConformanceTests(t *Test, partn int) {
 
 func CharacterByCharacterTests() {
 	tests := part[1].tests
-	last := 0
+	var last rune = 0
 	for i := 0; i <= len(tests); i++ { // last one is special case
-		var r int
+		var r rune
 		if i == len(tests) {
 			r = 0x2FA1E // Don't have to go to 0x10FFFF
 		} else {