Update to rust master

Author: alexcrichton

Cargo.lock

@@ -44,7 +44,8 @@ git = "https://github.com/conduit-rust/conduit-middleware"
 git = "https://github.com/conduit-rust/conduit-cookie"
 
 [dependencies.postgres]
-git = "https://github.com/sfackler/rust-postgres"
+git = "https://github.com/alexcrichton/rust-postgres"
+branch = "git-deps"
 
 [dependencies.html]
 path = "src/html"
@@ -83,16 +84,17 @@ git = "https://github.com/rust-lang/semver"
 git = "https://github.com/servo/rust-url"
 
 [dependencies.r2d2_postgres]
-git = "https://github.com/sfackler/r2d2-postgres"
+git = "https://github.com/alexcrichton/r2d2-postgres"
+branch = "git-deps"
 
 [dependencies.git2]
 git = "https://github.com/alexcrichton/git2-rs"
 
 [dependencies.openssl]
 git = "https://github.com/sfackler/rust-openssl"
 
-[dependencies]
-time = "*"
+[dependencies.time]
+git = "https://github.com/rust-lang/time"
 
 [dev-dependencies.conduit-test]
 git = "https://github.com/conduit-rust/conduit-test"

Cargo.toml

@@ -8,4 +8,5 @@ name = "migrate"
 path = "lib.rs"
 
 [dependencies.postgres]
-git = "https://github.com/sfackler/rust-postgres"
+git = "https://github.com/alexcrichton/rust-postgres"
+branch = "git-deps"

src/migrate/Cargo.toml

@@ -11,7 +11,7 @@ impl<R: Reader> HashingReader<R> {
         HashingReader { inner: r, hasher: Hasher::new(SHA256) }
     }
 
-    pub fn finalize(&self) -> Vec<u8> { self.hasher.finalize() }
+    pub fn finalize(self) -> Vec<u8> { self.hasher.finalize() }
 }
 
 impl<R: Reader> Reader for HashingReader<R> {