Update to rust master

Author: alexcrichton

Cargo.lock

@@ -39,12 +39,15 @@ name = "all"
 path = "src/tests/all.rs"
 
 [dependencies]
-rand = "0.1"
+s3 = { path = "src/s3" }
+migrate = { path = "src/migrate" }
+rand = "0.2"
 time = "0.1"
 git2 = "0.2"
 flate2 = "0.2"
 semver = "0.1.3"
 url = "0.2.0"
+postgres = { version = "0.7", features = ["time"] }
 r2d2 = "0.5.0"
 r2d2_postgres = "0.8"
 openssl = "0.5"
@@ -65,15 +68,6 @@ conduit-static = "0.7"
 conduit-git-http-backend = "0.7"
 civet = "0.7"
 
-[dependencies.postgres]
-version = "0.7"
-features = ["time"]
-
-[dependencies.s3]
-path = "src/s3"
-
-[dependencies.migrate]
-path = "src/migrate"
 
 [dev-dependencies]
 conduit-test = "0.7"

Cargo.toml

@@ -1 +1 @@
-2015-03-19
+2015-03-23