Update to rust master

Author: alexcrichton

Cargo.lock

@@ -91,8 +91,8 @@ git = "https://github.com/alexcrichton/git2-rs"
 [dependencies.openssl]
 git = "https://github.com/sfackler/rust-openssl"
 
-[dependencies.time]
-git = "https://github.com/rust-lang/time"
+[dependencies]
+time = "*"
 
 [dev-dependencies.conduit-test]
 git = "https://github.com/conduit-rust/conduit-test"

Cargo.toml

@@ -1,7 +1,6 @@
 extern crate "cargo-registry" as cargo_registry;
 extern crate "conduit-middleware" as conduit_middleware;
 extern crate civet;
-extern crate green;
 extern crate git2;
 
 use std::os;

src/bin/server.rs

@@ -161,8 +161,8 @@ fn json<T>(r: &mut conduit::Response) -> T
                     (k, fixup(v))
                 }).collect())
             }
-            json::List(list) => {
-                json::List(list.into_iter().map(fixup).collect())
+            json::Array(list) => {
+                json::Array(list.into_iter().map(fixup).collect())
             }
             j => j,
         }

src/tests/all.rs

@@ -67,8 +67,8 @@ pub fn json_response<'a, T>(t: &T) -> Response
                     (k, fixup(v))
                 }).collect())
             }
-            json::List(list) => {
-                json::List(list.into_iter().map(fixup).collect())
+            json::Array(list) => {
+                json::Array(list.into_iter().map(fixup).collect())
             }
             j => j,
         }