json: Marshal, Unmarshal using new scanner

R=r
CC=golang-dev
http://codereview.appspot.com/953041

2 files changed, 6 insertions, 8 deletions

diff --git a/src/pkg/expvar/expvar.go b/src/pkg/expvar/expvar.go
index 070ba4ee6..4017027b7 100644
--- a/src/pkg/expvar/expvar.go
+++ b/src/pkg/expvar/expvar.go
@@ -225,16 +225,13 @@ func expvarHandler(c *http.Conn, req *http.Request) {
 }
 
 func memstats() string {
-	var buf bytes.Buffer
-	json.MarshalIndent(&buf, &runtime.MemStats, "    ")
-	s := buf.String()
-	return s[0 : len(s)-1] // chop final \n
+	b, _ := json.MarshalIndent(&runtime.MemStats, "", "\t")
+	return string(b)
 }
 
 func cmdline() string {
-	var buf bytes.Buffer
-	json.Marshal(&buf, os.Args)
-	return buf.String()
+	b, _ := json.Marshal(os.Args)
+	return string(b)
 }
 
 func init() {
diff --git a/src/pkg/expvar/expvar_test.go b/src/pkg/expvar/expvar_test.go
index 2dc399e7d..98cd9c2ea 100644
--- a/src/pkg/expvar/expvar_test.go
+++ b/src/pkg/expvar/expvar_test.go
@@ -61,7 +61,8 @@ func TestMapCounter(t *testing.T) {
 	// colours.String() should be '{"red":3, "blue":4}',
 	// though the order of red and blue could vary.
 	s := colours.String()
-	j, err := json.Decode(s)
+	var j interface{}
+	err := json.Unmarshal([]byte(s), &j)
 	if err != nil {
 		t.Errorf("colours.String() isn't valid JSON: %v", err)
 	}