Merge pull request #138 from erickt/master

Expose serde_json::from_{iter,reader,slice}
2015-08-13 22:32:34 -07:00 · 2015-08-13 22:32:34 -07:00 · 7b773ac088
commit 7b773ac088
parent c61cea0eb1 fc58ea7487
1 changed files with 7 additions and 1 deletions
--- a/serde_json/src/lib.rs
+++ b/serde_json/src/lib.rs
@ -95,7 +95,13 @@
 extern crate num;
 extern crate serde;

-pub use self::de::{Deserializer, from_str};
+pub use self::de::{
+    Deserializer,
+    from_iter,
+    from_reader,
+    from_slice,
+    from_str,
+};
 pub use self::error::{Error, ErrorCode, Result};
 pub use self::ser::{
    Serializer,