---

yaml
---
r: 152215
b: refs/heads/try2
c: 8370137
h: refs/heads/master
i:
  152213: b69dc91
  152211: d13f685
  152207: 714c53d
v: v3

Author: bors

[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: 976c8324e1e5f2ec1e4bd4e8d029abce02ff7654
+refs/heads/try2: 837013717abaa0bb0e1a63f9fb2847c1f3d64479
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/ext/deriving/encodable.rs

@@ -176,6 +176,14 @@ fn encodable_substructure(cx: &mut ExtCtxt, trait_span: Span,
                 stmts.push(cx.stmt_expr(call));
             }
 
+            // unit structs have no fields and need to return Ok()
+            if stmts.is_empty() {
+                let ret_ok = cx.expr(trait_span,
+                                     ExprRet(Some(cx.expr_ok(trait_span,
+                                                             cx.expr_lit(trait_span, LitNil)))));
+                stmts.push(cx.stmt_expr(ret_ok));
+            }
+
             let blk = cx.lambda_stmts_1(trait_span, stmts, blkarg);
             cx.expr_method_call(trait_span,
                                 encoder,

branches/try2/src/test/run-pass/issue-14021.rs

@@ -0,0 +1,29 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+
+extern crate serialize;
+
+use serialize::{Encodable, Decodable};
+use serialize::json;
+
+#[deriving(Encodable, Decodable, PartialEq, Show)]
+struct UnitLikeStruct;
+
+pub fn main() {
+    let obj = UnitLikeStruct;
+    let json_str: String = json::Encoder::str_encode(&obj);
+
+    let json_object = json::from_str(json_str.as_slice());
+    let mut decoder = json::Decoder::new(json_object.unwrap());
+    let mut decoded_obj: UnitLikeStruct = Decodable::decode(&mut decoder).unwrap();
+
+    assert_eq!(obj, decoded_obj);
+}