Updating serde and diesel to macros 1.1, bumping nightly.

Closes #103

Author: anp

Cargo.lock

@@ -4,35 +4,34 @@ version = "0.1.0"
 authors = ["Adam Perry <[email protected]>"]
 
 [dependencies]
-chrono = {version = "0.2.21", features = ["serde"] }
+chrono = {version = "0.2.25", features = ["serde"] }
 clap = "2.2.5"
 crossbeam = "0.2.9"
 dotenv = "0.8.0"
-dotenv_macros = "0.8.0"
 env_logger = "0.3.3"
 hyper = "0.8.0"
 iron = "0.3.0"
 lazy_static = "0.2.0"
 log = "0.3.6"
 mount = "0.1.0"
 r2d2 = "0.7.0"
-r2d2-diesel = "0.6.0"
+r2d2-diesel = "0.8"
 regex = "0.1"
 router = "0.1.1"
-serde = "0.7.0"
-serde_json = "0.7.0"
-serde_macros = "0.7.0"
+serde = "0.8"
+serde_derive = "0.8"
+serde_json = "0.8"
 urlencoded = "0.3.0"
 
 [dependencies.diesel]
-version = "0.6.2"
+version = "0.8"
 default-features = false
 features = ["postgres", "chrono", "large-tables"]
 
 [dependencies.diesel_codegen]
-version = "0.6.2"
+version = "0.8"
 default-features = false
-features = ["nightly", "postgres"]
+features = ["dotenv", "postgres"]
 
 [profile.release]
 debug = false

Cargo.toml

@@ -79,7 +79,7 @@ Not guaranteed to be updated regularly, but last time I remembered to update thi
 
 ```bash
 $ rustc --version
-rustc 1.11.0-nightly (bb4a79b08 2016-06-15)
+rustc 1.14.0-nightly (16eeeac78 2016-10-18)
 ```
 
 ### Environment variables
@@ -135,7 +135,7 @@ The launch the scraping daemon, make sure the interval environment variables are
 
 Setup a postgres database and user on a server with `dpkg` (recent Ubuntu is what's tested), and install nginx.
 
-Run `build.sh` on that with a compatible nightly installed (2016-05-24 right now). This will create a `rust-dashboard.deb` in the repo root. Install with `dpkg -i rust-dashboard.deb`, configure `/etc/rust-dashboard/env` from the example file there, and start the services:
+Run `build.sh` on that with a compatible nightly installed (2016-10-18 right now). This will create a `rust-dashboard.deb` in the repo root. Install with `dpkg -i rust-dashboard.deb`, configure `/etc/rust-dashboard/env` from the example file there, and start the services:
 
 ```bash
 sudo systemctl enable rust-dashboard-scraper

README.md

@@ -26,7 +26,7 @@ Vagrant.configure("2") do |config|
                       path: "vagrant/rust.sh",
                       keep_color: true,
                       privileged: false,
-                      env: { 'RUST_NIGHTLY_VERSION' => 'nightly-2016-06-15', },)
+                      env: { 'RUST_NIGHTLY_VERSION' => 'nightly-2016-10-19', },)
 
   config.vm.network :forwarded_port, guest: 4200, host: 4040
   config.vm.network :forwarded_port, guest: 5432, host: 4050

Vagrantfile

@@ -2,9 +2,9 @@ use chrono::NaiveDateTime;
 use diesel::prelude::*;
 use super::schema::*;
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable, Serialize)]
-#[insertable_into(build)]
-#[changeset_for(build)]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Insertable,
+         Ord, PartialEq, PartialOrd, Queryable, Serialize)]
+#[table_name="build"]
 pub struct Build {
     pub number: i32,
     pub builder_name: String,

src/domain/buildbot.rs

@@ -1,21 +1,22 @@
 // Copyright 2016 Adam Perry. Dual-licensed MIT and Apache 2.0 (see LICENSE files for details).
 
 use chrono::NaiveDateTime;
-use diesel::{ExpressionMethods, FilterDsl, LoadDsl, Queryable, SaveChangesDsl, Table};
+use diesel::ExpressionMethods;
 
 use super::schema::*;
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable, Serialize)]
-#[insertable_into(githubuser)]
-#[changeset_for(githubuser)]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Insertable,
+         Ord, PartialEq, PartialOrd, Queryable, Serialize)]
+#[table_name="githubuser"]
 pub struct GitHubUser {
     pub id: i32,
     pub login: String,
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
-#[insertable_into(milestone)]
-#[changeset_for(milestone, treat_none_as_null="true")]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Insertable,
+         Ord, PartialEq, PartialOrd, Queryable)]
+#[table_name="milestone"]
+#[treat_none_as_null="true"]
 pub struct Milestone {
     pub id: i32,
     pub number: i32,
@@ -32,8 +33,9 @@ pub struct Milestone {
     pub repository: String,
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable, Serialize)]
-#[insertable_into(issue)]
+#[derive(Clone, Debug, Deserialize, Eq, Insertable,
+         Ord, PartialEq, PartialOrd, Queryable, Serialize)]
+#[table_name="issue"]
 pub struct IssuePartial {
     pub number: i32,
     pub fk_milestone: Option<i32>,
@@ -73,8 +75,10 @@ impl IssuePartial {
     }
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable, Serialize)]
-#[changeset_for(issue, treat_none_as_null="true")]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Ord,
+         PartialEq, PartialOrd, Queryable, Serialize)]
+#[table_name="issue"]
+#[treat_none_as_null="true"]
 pub struct Issue {
     pub id: i32,
     pub number: i32,
@@ -93,9 +97,10 @@ pub struct Issue {
     pub repository: String,
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable, Serialize)]
-#[insertable_into(issuecomment)]
-#[changeset_for(issuecomment, treat_none_as_null="true")]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Insertable,
+         Ord, PartialEq, PartialOrd, Queryable, Serialize)]
+#[table_name="issuecomment"]
+#[treat_none_as_null="true"]
 pub struct IssueComment {
     pub id: i32,
     pub fk_issue: i32,
@@ -106,9 +111,10 @@ pub struct IssueComment {
     pub repository: String,
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
-#[insertable_into(pullrequest)]
-#[changeset_for(pullrequest, treat_none_as_null="true")]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Insertable,
+         Ord, PartialEq, PartialOrd, Queryable)]
+#[table_name="pullrequest"]
+#[treat_none_as_null="true"]
 pub struct PullRequest {
     pub number: i32,
     pub state: String,
@@ -128,17 +134,17 @@ pub struct PullRequest {
     pub repository: String,
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
-#[changeset_for(teams)]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
+#[table_name="teams"]
 pub struct Team {
     pub id: i32,
     pub name: String,
     pub ping: String,
     pub label: String,
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
-#[changeset_for(memberships)]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
+#[table_name="memberships"]
 pub struct Membership {
     pub id: i32,
     pub fk_member: i32,

src/domain/github.rs

@@ -3,9 +3,9 @@ use diesel::ExpressionMethods;
 
 use super::schema::*;
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable, Serialize)]
-#[insertable_into(release)]
-#[changeset_for(release)]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Insertable,
+         Ord, PartialEq, PartialOrd, Queryable, Serialize)]
+#[table_name="release"]
 pub struct Release {
     pub date: NaiveDate,
     pub released: bool,

src/domain/releases.rs

@@ -1,10 +1,10 @@
 use chrono::NaiveDateTime;
-use diesel::{ExpressionMethods, FilterDsl, LoadDsl, Queryable, SaveChangesDsl, Table};
+use diesel::ExpressionMethods;
 
 use super::schema::*;
 
-#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
-#[insertable_into(fcp_proposal)]
+#[derive(Clone, Debug, Eq, Ord, Insertable, PartialEq, PartialOrd)]
+#[table_name="fcp_proposal"]
 pub struct NewFcpProposal<'a> {
     pub fk_issue: i32,
     pub fk_initiator: i32,
@@ -15,8 +15,9 @@ pub struct NewFcpProposal<'a> {
     pub fcp_closed: bool,
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable, Serialize)]
-#[changeset_for(fcp_proposal, treat_none_as_null="true")]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Ord,
+         PartialEq, PartialOrd, Queryable, Serialize)]
+#[table_name="fcp_proposal"]
 pub struct FcpProposal {
     pub id: i32,
     pub fk_issue: i32,
@@ -28,25 +29,25 @@ pub struct FcpProposal {
     pub fcp_closed: bool,
 }
 
-#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, Serialize)]
-#[insertable_into(fcp_review_request)]
+#[derive(Clone, Debug, Eq, Insertable, Ord, PartialEq, PartialOrd, Serialize)]
+#[table_name="fcp_review_request"]
 pub struct NewFcpReviewRequest {
     pub fk_proposal: i32,
     pub fk_reviewer: i32,
     pub reviewed: bool,
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable, Serialize)]
-#[changeset_for(fcp_review_request, treat_none_as_null="true")]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable, Serialize)]
+#[table_name="fcp_review_request"]
 pub struct FcpReviewRequest {
     pub id: i32,
     pub fk_proposal: i32,
     pub fk_reviewer: i32,
     pub reviewed: bool,
 }
 
-#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
-#[insertable_into(fcp_concern)]
+#[derive(Clone, Debug, Eq, Insertable, Ord, PartialEq, PartialOrd)]
+#[table_name="fcp_concern"]
 pub struct NewFcpConcern<'a> {
     pub fk_proposal: i32,
     pub fk_initiator: i32,
@@ -55,8 +56,8 @@ pub struct NewFcpConcern<'a> {
     pub fk_initiating_comment: i32,
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
-#[changeset_for(fcp_concern, treat_none_as_null="true")]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
+#[table_name="fcp_concern"]
 pub struct FcpConcern {
     pub id: i32,
     pub fk_proposal: i32,
@@ -66,17 +67,17 @@ pub struct FcpConcern {
     pub fk_initiating_comment: i32,
 }
 
-#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
-#[insertable_into(rfc_feedback_request)]
+#[derive(Clone, Debug, Eq, Insertable, Ord, PartialEq, PartialOrd)]
+#[table_name="rfc_feedback_request"]
 pub struct NewFeedbackRequest {
     pub fk_initiator: i32,
     pub fk_requested: i32,
     pub fk_issue: i32,
     pub fk_feedback_comment: Option<i32>,
 }
 
-#[derive(Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
-#[changeset_for(rfc_feedback_request, treat_none_as_null="true")]
+#[derive(AsChangeset, Clone, Debug, Deserialize, Eq, Ord, PartialEq, PartialOrd, Queryable)]
+#[table_name="rfc_feedback_request"]
 pub struct FeedbackRequest {
     pub id: i32,
     pub fk_initiator: i32,

src/domain/rfcbot.rs

@@ -1 +1 @@
-infer_schema!(dotenv!("DATABASE_URL"));
+infer_schema!("dotenv:DATABASE_URL");

src/domain/schema.rs

@@ -71,7 +71,7 @@ impl Client {
 
             let repo = match v.get("name") {
                 Some(n) => {
-                    match n.as_string() {
+                    match n.as_str() {
                         Some(s) => format!("{}/{}", org, s),
                         None => return Err(DashError::Misc),
                     }

src/github/client.rs

@@ -1,13 +1,14 @@
 // Copyright 2016 Adam Perry. Dual-licensed MIT and Apache 2.0 (see LICENSE files for details).
 
-#![feature(custom_attribute, custom_derive, plugin, question_mark)]
-#![plugin(diesel_codegen, dotenv_macros, serde_macros)]
+#![feature(proc_macro)]
 
 extern crate chrono;
 extern crate clap;
 extern crate crossbeam;
 #[macro_use]
 extern crate diesel;
+#[macro_use]
+extern crate diesel_codegen;
 extern crate dotenv;
 extern crate env_logger;
 #[macro_use]
@@ -25,6 +26,8 @@ extern crate regex;
 #[macro_use]
 extern crate router;
 extern crate serde;
+#[macro_use]
+extern crate serde_derive;
 extern crate serde_json;
 extern crate urlencoded;