---

huonw · graydon · commit ef36d58cc4d2 · 2012-12-11T16:04:58.000-08:00
yaml --- r: 40764 b: refs/heads/dist-snap c: 76dc781 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: a55ea48d2bd3b56ce6e8667e8bebc72371f17dd8
+refs/heads/dist-snap: 76dc7818eae05dab94429a61c95a400a2b85c2fe
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
diff --git a/branches/dist-snap/src/libstd/json.rs b/branches/dist-snap/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 {`