From e2bf22715dedcfcbfd8c6d7b0046529bf9b4c89d Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 16 Apr 2009 23:07:15 -0700 Subject: [PATCH] make string take []byte only, so have to use *[10]byte to convert R=r DELTA=4 (0 added, 0 deleted, 4 changed) OCL=27578 CL=27584 --- test/fixedbugs/bug102.go | 4 ++-- test/ken/string.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/fixedbugs/bug102.go b/test/fixedbugs/bug102.go index 58480974ba..92163baa1c 100644 --- a/test/fixedbugs/bug102.go +++ b/test/fixedbugs/bug102.go @@ -8,12 +8,12 @@ package main func main() { var b [0]byte; - s := string(b); // out of bounds trap + s := string(&b); // out of bounds trap if s != "" { panic("bad convert") } var b1 = [5]byte{'h', 'e', 'l', 'l', 'o'}; - if string(b1) != "hello" { + if string(&b1) != "hello" { panic("bad convert 1") } var b2 = make([]byte, 5); diff --git a/test/ken/string.go b/test/ken/string.go index 850ddccf69..a823e92835 100644 --- a/test/ken/string.go +++ b/test/ken/string.go @@ -86,7 +86,7 @@ main() z1[0] = 'a'; z1[1] = 'b'; z1[2] = 'c'; - c = string(z1); + c = string(&z1); if c != "abc" { panic("create array ", c); } @@ -96,7 +96,7 @@ main() z2[0] = 'a'; z2[1] = 'b'; z2[2] = 'c'; - c = string(*z2); + c = string(z2); if c != "abc" { panic("create array pointer ", c); } -- 2.48.1