---

yaml
---
r: 139419
b: refs/heads/try2
c: aa779c1
h: refs/heads/master
i:
  139417: 9d8a907
  139415: b407075
v: v3

Author: erickt

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: ce9e5ecb6c1f833eccb520b4179cf86329331fa6
+refs/heads/try2: aa779c1240afd0f5e46897b6ddfa55126471bf19
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/ebml.rs

@@ -411,13 +411,13 @@ pub mod reader {
         }
 
         #[cfg(stage0)]
-        fn read_option<T>(&self, f: &fn() -> T) -> Option<T> {
+        fn read_option<T>(&self, f: &fn(bool) -> T) -> T {
             debug!("read_option()");
             do self.read_enum("Option") || {
                 do self.read_enum_variant |idx| {
                     match idx {
-                        0 => None,
-                        1 => Some(f()),
+                        0 => f(false),
+                        1 => f(true),
                         _ => fail!(),
                     }
                 }
@@ -427,13 +427,13 @@ pub mod reader {
         #[cfg(stage1)]
         #[cfg(stage2)]
         #[cfg(stage3)]
-        fn read_option<T>(&self, f: &fn() -> T) -> Option<T> {
+        fn read_option<T>(&self, f: &fn(bool) -> T) -> T {
             debug!("read_option()");
             do self.read_enum("Option") || {
                 do self.read_enum_variant(["None", "Some"]) |idx| {
                     match idx {
-                        0 => None,
-                        1 => Some(f()),
+                        0 => f(false),
+                        1 => f(true),
                         _ => fail!(),
                     }
                 }

branches/try2/src/libstd/json.rs

@@ -980,10 +980,10 @@ impl<'self> serialize::Decoder for Decoder<'self> {
         }
     }
 
-    fn read_option<T>(&self, f: &fn() -> T) -> Option<T> {
+    fn read_option<T>(&self, f: &fn(bool) -> T) -> T {
         match *self.peek() {
-            Null => { self.pop(); None }
-            _ => Some(f()),
+            Null => { self.pop(); f(false) }
+            _ => f(true),
         }
     }
 }

branches/try2/src/libstd/serialize.rs

@@ -118,7 +118,7 @@ pub trait Decoder {
     fn read_tup_elt<T>(&self, idx: uint, f: &fn() -> T) -> T;
 
     // Specialized types:
-    fn read_option<T>(&self, f: &fn() -> T) -> Option<T>;
+    fn read_option<T>(&self, f: &fn(bool) -> T) -> T;
 }
 
 pub trait Encodable<S:Encoder> {
@@ -395,7 +395,13 @@ impl<S:Encoder,T:Encodable<S>> Encodable<S> for Option<T> {
 
 impl<D:Decoder,T:Decodable<D>> Decodable<D> for Option<T> {
     fn decode(d: &D) -> Option<T> {
-        d.read_option(|| Decodable::decode(d))
+        do d.read_option |b| {
+            if b {
+                Some(Decodable::decode(d))
+            } else {
+                None
+            }
+        }
     }
 }