---

erickt · erickt · commit af9436e27cec · 2013-11-29T11:19:18.000-08:00
yaml --- r: 93985 b: refs/heads/try c: 5b41df4 h: refs/heads/master i: 93983: febed5b v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 18ca312984b331b87b1a205b3cb954b16912ed82
+refs/heads/try: 5b41df4ca027421a86aeb8d2e96f3754b213c1d5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/libextra/json.rs b/branches/try/src/libextra/json.rs
@@ -1195,10 +1195,6 @@ impl ToJson for Json {
     fn to_json(&self) -> Json { (*self).clone() }
 }
 
-impl ToJson for @Json {
-    fn to_json(&self) -> Json { (**self).to_json() }
-}
-
 impl ToJson for int {
     fn to_json(&self) -> Json { Number(*self as f64) }
 }
@@ -1259,10 +1255,6 @@ impl ToJson for ~str {
     fn to_json(&self) -> Json { String((*self).clone()) }
 }
 
-impl ToJson for @~str {
-    fn to_json(&self) -> Json { String((**self).clone()) }
-}
-
 impl<A:ToJson,B:ToJson> ToJson for (A, B) {
     fn to_json(&self) -> Json {
         match *self {

Original file line number	Diff line number	Diff line change
`@@ -1195,10 +1195,6 @@ impl ToJson for Json {`
`1195`	`1195`	`fn to_json(&self) -> Json { (*self).clone() }`
`1196`	`1196`	`}`
`1197`	`1197`
`1198`		`-impl ToJson for @Json {`
`1199`		`- fn to_json(&self) -> Json { (**self).to_json() }`
`1200`		`-}`
`1201`		`-`
`1202`	`1198`	`impl ToJson for int {`
`1203`	`1199`	`fn to_json(&self) -> Json { Number(*self as f64) }`
`1204`	`1200`	`}`
`@@ -1259,10 +1255,6 @@ impl ToJson for ~str {`
`1259`	`1255`	`fn to_json(&self) -> Json { String((*self).clone()) }`
`1260`	`1256`	`}`
`1261`	`1257`
`1262`		`-impl ToJson for @~str {`
`1263`		`- fn to_json(&self) -> Json { String((**self).clone()) }`
`1264`		`-}`
`1265`		`-`
`1266`	`1258`	`impl<A:ToJson,B:ToJson> ToJson for (A, B) {`
`1267`	`1259`	`fn to_json(&self) -> Json {`
`1268`	`1260`	`match *self {`