Merge pull request rust-lang#897 from sgrif/sg-update-diesel

Update to Diesel 0.15.0

Author: sgrif

Cargo.lock

@@ -40,10 +40,10 @@ hex = "0.2"
 license-exprs = "^1.3"
 dotenv = "0.10.0"
 toml = "0.4"
-diesel = { version = "0.14.0", features = ["postgres", "serde_json", "deprecated-time", "chrono"] }
-diesel_codegen = "0.14.0"
-r2d2-diesel = "0.14.0"
-diesel_full_text_search = "0.14.0"
+diesel = { version = "0.15.0", features = ["postgres", "serde_json", "deprecated-time", "chrono"] }
+diesel_codegen = "0.15.0"
+r2d2-diesel = "0.15.0"
+diesel_full_text_search = "0.15.0"
 serde_json = "1.0.0"
 serde_derive = "1.0.0"
 serde = "1.0.0"
@@ -67,7 +67,7 @@ bufstream = "0.1"
 
 [build-dependencies]
 dotenv = "0.10"
-diesel = { version = "0.14", features = ["postgres"] }
+diesel = { version = "0.15.0", features = ["postgres"] }
 
 [features]
 unstable = []

Cargo.toml

@@ -196,7 +196,7 @@ mod test {
         let conn = conn();
         let user = user(&conn);
         let (krate, version) = crate_and_version(&conn, user.id);
-        // FIXME: Diesel 0.15 or 1.0 can do this:
+        // FIXME: Diesel 1.0 can do this:
         // insert((version_id.eq(version.id),))
         //     .into(version_downloads)
         //     .execute(&conn)

src/bin/update-downloads.rs

@@ -183,10 +183,3 @@ table! {
         license -> Nullable<Varchar>,
     }
 }
-
-numeric_expr!(crate_downloads::downloads);
-numeric_expr!(crates::downloads);
-numeric_expr!(metadata::total_downloads);
-numeric_expr!(version_downloads::counted);
-numeric_expr!(version_downloads::downloads);
-numeric_expr!(versions::downloads);