Skip to content

Commit c92250e

Browse files
committed
Bump to 0.3.7
1 parent 7fa5383 commit c92250e

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "rustc-serialize"
4-
version = "0.3.6"
4+
version = "0.3.7"
55
authors = ["The Rust Project Developers"]
66
license = "MIT/Apache-2.0"
77
readme = "README.md"

src/hex.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ impl FromHex for str {
112112
/// fn main () {
113113
/// let hello_str = "Hello, World".as_bytes().to_hex();
114114
/// println!("{}", hello_str);
115-
/// let bytes = hello_str.as_slice().from_hex().unwrap();
115+
/// let bytes = hello_str.from_hex().unwrap();
116116
/// println!("{:?}", bytes);
117117
/// let result_str = String::from_utf8(bytes).unwrap();
118118
/// println!("{}", result_str);

src/json.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1994,7 +1994,10 @@ impl Decoder {
19941994

19951995
impl Decoder {
19961996
fn pop(&mut self) -> DecodeResult<Json> {
1997-
self.stack.pop().ok_or(EOF)
1997+
match self.stack.pop() {
1998+
Some(s) => Ok(s),
1999+
None => Err(EOF),
2000+
}
19982001
}
19992002
}
20002003

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
//! Support code for encoding and decoding types.
1212
13-
#![feature(core, convert)]
13+
#![feature(convert)]
1414
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
1515
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
1616
html_root_url = "http://doc.rust-lang.org/rustc-serialize/")]
1717
#![cfg_attr(test, deny(warnings))]
18-
#![cfg_attr(test, feature(test))]
18+
#![cfg_attr(test, feature(test, std_misc))]
1919

2020
#[cfg(test)] extern crate test;
2121
#[cfg(test)] extern crate rand;

0 commit comments

Comments
 (0)