Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix deriving Encodable trait for unit structs
Closes #14021
- Loading branch information
Showing
2 changed files
with
37 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); | ||
} |
1dc13e4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at Sawyer47@1dc13e4
1dc13e4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging Sawyer47/rust/encodable-fix = 1dc13e4 into auto
1dc13e4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sawyer47/rust/encodable-fix = 1dc13e4 merged ok, testing candidate = 46dad76
1dc13e4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/6037
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/6035
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/5131
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/5140
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/6135
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/5223
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/5231
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/6137
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/5222
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/5228
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/5288
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/3024
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/6127
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/5223
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/5238
1dc13e4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 46dad76