---

huonw · graydon · commit 86f35026436f · 2012-12-11T16:04:58.000-08:00
yaml --- r: 36669 b: refs/heads/try2 c: 76dc781 h: refs/heads/master i: 36667: 83294c2 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a55ea48d2bd3b56ce6e8667e8bebc72371f17dd8
+refs/heads/try2: 76dc7818eae05dab94429a61c95a400a2b85c2fe
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/src/libstd/json.rs b/branches/try2/src/libstd/json.rs
@@ -782,8 +782,11 @@ pub impl Deserializer: serialization::Deserializer {
     }
 
     fn read_managed_str(&self) -> @str {
-        // FIXME(#3604): There's no way to convert from a ~str to a @str.
-        fail ~"read_managed_str()";
+        debug!("read_managed_str");
+        match *self.pop() {
+            String(ref s) => s.to_managed(),
+            _ => fail ~"not a string"
+        }
     }
 
     fn read_owned<T>(&self, f: fn() -> T) -> T {

Original file line number	Diff line number	Diff line change
`@@ -782,8 +782,11 @@ pub impl Deserializer: serialization::Deserializer {`
`782`	`782`	`}`
`783`	`783`
`784`	`784`	`fn read_managed_str(&self) -> @str {`
`785`		`- // FIXME(#3604): There's no way to convert from a ~str to a @str.`
`786`		`- fail ~"read_managed_str()";`
	`785`	`+ debug!("read_managed_str");`
	`786`	`+ match *self.pop() {`
	`787`	`+ String(ref s) => s.to_managed(),`
	`788`	`+ _ => fail ~"not a string"`
	`789`	`+ }`
`787`	`790`	`}`
`788`	`791`
`789`	`792`	`fn read_owned<T>(&self, f: fn() -> T) -> T {`