Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix tree for reflect rename

Browse source 
R=golang-dev, r
CC=golang-dev
https://golang.org/cl/4435067
This commit is contained in:
Russ Cox 2011-04-25 13:39:36 -04:00
parent 0e2bb62f23
commit 07abf1c732
46 changed files with 195 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pkg/json/decode_test.go
View file

@ -21,7 +21,7 @@ type tx struct {
x int
}
var txType = reflect.Typeof((*tx)(nil)).Elem()
var txType = reflect.TypeOf((*tx)(nil)).Elem()
// A type that can unmarshal itself.
@ -64,7 +64,7 @@ var unmarshalTests = []unmarshalTest{
{`"g-clef: \uD834\uDD1E"`, new(string), "g-clef: \U0001D11E", nil},
{`"invalid: \uD834x\uDD1E"`, new(string), "invalid: \uFFFDx\uFFFD", nil},
{"null", new(interface{}), nil, nil},
{`{"X": [1,2,3], "Y": 4}`, new(T), T{Y: 4}, &UnmarshalTypeError{"array", reflect.Typeof("")}},
{`{"X": [1,2,3], "Y": 4}`, new(T), T{Y: 4}, &UnmarshalTypeError{"array", reflect.TypeOf("")}},
{`{"x": 1}`, new(tx), tx{}, &UnmarshalFieldError{"x", txType, txType.Field(0)}},
// skip invalid tags
@ -138,7 +138,7 @@ func TestUnmarshal(t *testing.T) {
continue
}
// v = new(right-type)
v := reflect.New(reflect.Typeof(tt.ptr).Elem())
v := reflect.New(reflect.TypeOf(tt.ptr).Elem())
if err := Unmarshal([]byte(in), v.Interface()); !reflect.DeepEqual(err, tt.err) {
t.Errorf("#%d: %v want %v", i, err, tt.err)
continue