Update rocket, diesel and add Amanieu to T-libs (#264)

* Upgrade to Rocket 0.4.
* Update diesel to 1.4.1.
* rustup nightly
* cargo update
* Add Amanieu to T-libs.

Author: Centril

Cargo.lock

@@ -4,17 +4,15 @@ name = "rfcbot-rs"
 version = "0.1.0"
 
 [dependencies]
-dotenv = "0.9.0"
+dotenv = "0.13.0"
 env_logger = "0.4"
-hex = "0.2.0"
-handlebars = "0.29.0"
+hex = "0.3.2"
 hyper = "0.10"
-hyper-native-tls = "0.2.1"
-lazy_static = "0.2.0"
+hyper-native-tls = "0.3.0"
+lazy_static = "1.2.0"
 log = "0.3.6"
-rocket = "0.3.3"
-rocket_codegen = "0.3.3"
-rocket_contrib = "0.3.3"
+rocket = "0.4.0"
+rocket_contrib = { version = "0.4.0", features = ["json", "handlebars_templates"] }
 rust-crypto = "0.2.36"
 serde = "1.0.59"
 serde_derive = "1.0.59"
@@ -23,7 +21,7 @@ toml = "0.4"
 url = "1.4"
 urlencoded = "0.5"
 maplit = "1.0.1"
-itertools = "0.7.8"
+itertools = "0.8.0"
 
 [dependencies.chrono]
 features = ["serde"]
@@ -32,4 +30,4 @@ version = "0.4"
 [dependencies.diesel]
 default-features = false
 features = ["postgres", "chrono", "r2d2", "32-column-tables"]
-version = "1.3.2"
+version = "1.4.1"

Cargo.toml

@@ -51,6 +51,7 @@ members = [
   "withoutboats",
   "Kimundi",
   "SimonSapin",
+  "Amanieu",
 ]
 
 [teams.T-compiler]

rfcbot.toml

@@ -1 +1 @@
-nightly-2018-08-02
+nightly-2019-02-22

rust-toolchain

@@ -5,9 +5,9 @@ use std::convert::From;
 use std::io;
 
 use diesel;
-use handlebars;
 use hyper;
 use serde_json;
+use rocket_contrib::templates::handlebars;
 
 pub type DashResult<T> = std::result::Result<T, DashError>;
 

src/error.rs

@@ -143,8 +143,8 @@ impl Client {
 
                 if tokens[1] == "rel=\"next\"" {
                     let url = tokens[0]
-                        .trim_left_matches('<')
-                        .trim_right_matches('>')
+                        .trim_start_matches('<')
+                        .trim_end_matches('>')
                         .to_string();
                     return Some(url);
                 }

src/github/client.rs

@@ -216,8 +216,8 @@ fn parse_fcp_subcommand<'a>(
 fn from_invocation_line<'a>
     (setup: &'a RfcbotConfig, command: &'a str) -> DashResult<RfcBotCommand<'a>>
 {
-    let mut tokens = command.trim_left_matches(RFC_BOT_MENTION).trim()
-                            .trim_left_matches(':').trim()
+    let mut tokens = command.trim_start_matches(RFC_BOT_MENTION).trim()
+                            .trim_start_matches(':').trim()
                             .split_whitespace();
     let invocation = tokens.next().ok_or(DashError::Misc(None))?;
     match invocation {

src/github/command.rs

@@ -187,9 +187,9 @@ fn parse_ticky_boxes<'a>(what: &'a str, id: i32, comment: &'a IssueComment)
     -> impl Iterator<Item = &'a str>
 {
     comment.body.lines().filter_map(move |line| if line.starts_with("* [") {
-        let l = line.trim_left_matches("* [");
+        let l = line.trim_start_matches("* [");
         let reviewed = l.starts_with('x');
-        let remaining = l.trim_left_matches("x] @").trim_left_matches(" ] @");
+        let remaining = l.trim_start_matches("x] @").trim_start_matches(" ] @");
 
         if let Some(username) = remaining.split_whitespace().next() {
             trace!("reviewer parsed as reviewed? {} (line: \"{}\")",

src/github/nag.rs

@@ -6,7 +6,7 @@ use crypto::mac::MacResult;
 use crypto::sha1::Sha1;
 use hex::FromHex;
 use rocket::http::Status;
-use rocket::data::{self, Data, FromData};
+use rocket::data::{self, Data, FromDataSimple};
 use rocket::request::Request;
 use rocket::outcome::Outcome::*;
 use serde_json;
@@ -22,7 +22,7 @@ pub struct Event {
     pub payload: Payload,
 }
 
-impl FromData for Event {
+impl FromDataSimple for Event {
     type Error = &'static str;
     fn from_data(request: &Request, data: Data) -> data::Outcome<Self, Self::Error> {
         let headers = request.headers();

src/github/webhooks.rs

@@ -1,16 +1,12 @@
 #![feature(never_type)]
-
-#![feature(plugin)]
-#![feature(never_type)]
-#![plugin(rocket_codegen)]
+#![feature(proc_macro_hygiene, decl_macro)]
 
 extern crate chrono;
 extern crate crypto;
 #[macro_use]
 extern crate diesel;
 extern crate dotenv;
 extern crate env_logger;
-extern crate handlebars;
 extern crate hex;
 #[macro_use]
 extern crate hyper;
@@ -19,6 +15,7 @@ extern crate hyper_native_tls;
 extern crate lazy_static;
 #[macro_use]
 extern crate log;
+#[macro_use]
 extern crate rocket;
 extern crate rocket_contrib;
 extern crate serde;