about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-03 01:26:49 -0700
committerbors <bors@rust-lang.org>2014-05-03 01:26:49 -0700
commitd1ca0b13718f87f3f5498843f4e13d1b0b855c7e (patch)
tree1f7c95ab85235f0df07ed8c52b2c600f909a1060 /src
parent3a321b001fd65ccbf34e626dbac6ab1ac2fa1ca3 (diff)
parent923a8f39caa4504b7825ff9f8ba0b875345ebf83 (diff)
downloadrust-d1ca0b13718f87f3f5498843f4e13d1b0b855c7e.tar.gz
rust-d1ca0b13718f87f3f5498843f4e13d1b0b855c7e.zip
auto merge of #13891 : hjr3/rust/serialize-vec, r=pcwalton
Now that ~[T] is obsolete, we need to allow to_json() to work for
vectors.
Diffstat (limited to 'src')
-rw-r--r--src/libserialize/json.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index 25ee03a44c2..6e7fab21442 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -2233,6 +2233,10 @@ impl<A:ToJson> ToJson for ~[A] {
     fn to_json(&self) -> Json { List(self.iter().map(|elt| elt.to_json()).collect()) }
 }
 
+impl<A:ToJson> ToJson for Vec<A> {
+    fn to_json(&self) -> Json { List(self.iter().map(|elt| elt.to_json()).collect()) }
+}
+
 impl<A:ToJson> ToJson for TreeMap<~str, A> {
     fn to_json(&self) -> Json {
         let mut d = TreeMap::new();