about summary refs log tree commit diff
path: root/src/libserialize/lib.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-02-21 14:18:39 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-02-24 09:51:39 -0800
commit6485917d7ca832ee8867c6a7a55af3ed1e9d304c (patch)
treeb5c5ce62644376eae2ebb150c5d14a8eb34fe5fb /src/libserialize/lib.rs
parent672097753a217d4990129cbdfab16ef8c9b08b21 (diff)
downloadrust-6485917d7ca832ee8867c6a7a55af3ed1e9d304c.tar.gz
rust-6485917d7ca832ee8867c6a7a55af3ed1e9d304c.zip
Move extra::json to libserialize
This also inverts the dependency between libserialize and libcollections.

cc #8784
Diffstat (limited to 'src/libserialize/lib.rs')
-rw-r--r--src/libserialize/lib.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
index f89f56c0f34..f8bb39bd34d 100644
--- a/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@ -26,12 +26,15 @@ Core encoding and decoding interfaces.
 #[cfg(test)]
 extern crate test;
 
+extern crate collections;
+
 pub use self::serialize::{Decoder, Encoder, Decodable, Encodable,
-    DecoderHelpers, EncoderHelpers};
+                          DecoderHelpers, EncoderHelpers};
 
 mod serialize;
+mod collection_impls;
 
 pub mod base64;
 pub mod ebml;
 pub mod hex;
-
+pub mod json;