cargo: cargo update and fix for some deps

Cargo.toml

@@ -16,9 +16,9 @@ members = [
 hagrid-database = { path = "database" }
 chrono = "0.4.10"
 anyhow = "1"
-rocket = { version = "0.5.0-rc.1", features = [ "json" ] }
-rocket_dyn_templates = { version = "0.1.0-rc.1", features = ["handlebars"] }
-rocket_codegen = "0.5.0-rc.1"
+rocket = { version = "0.5.0-rc.2", features = [ "json" ] }
+rocket_dyn_templates = { version = "0.1.0-rc.2", features = ["handlebars"] }
+rocket_codegen = "0.5.0-rc.2"
 sequoia-openpgp =  { version = "1", default-features = false, features = ["crypto-nettle"] }
 multipart = "0"
 serde = "1.0"
@@ -28,7 +28,6 @@ time = "0.1"
 tempfile = "3.0"
 structopt = "0.2"
 url = "1.6"
-handlebars = "3"
 num_cpus = "1.0"
 ring = "0.13"
 base64 = "0.10"
@@ -40,7 +39,8 @@ gettext-utils = "0.1"
 gettext = "0.4"
 glob = "0.3"
 hyperx = "1.4"
-lettre = { version = "0.10.0-rc.5", default-features = false, features = ["builder", "file-transport", "sendmail-transport"] }
+# this is a slightly annoying update, so keeping this back for now
+lettre = { version = "=0.10.0-rc.5", default-features = false, features = ["builder", "file-transport", "sendmail-transport"] }
 
 [dependencies.rocket_i18n]
 git = "https://github.com/Plume-org/rocket_i18n"

src/i18n.rs

@@ -1,4 +1,4 @@
-use handlebars::{
+use rocket_dyn_templates::handlebars::{
     Context, Handlebars, Helper, HelperDef, HelperResult, Output, RenderContext, RenderError,
 };
 

src/mail.rs

@@ -1,9 +1,9 @@
 use std::path::{Path, PathBuf};
 
 use crate::counters;
-use handlebars::Handlebars;
 use lettre::message::{header, Mailbox, MultiPart, SinglePart};
 use lettre::{FileTransport, SendmailTransport, Transport as LettreTransport};
+use rocket_dyn_templates::handlebars::Handlebars;
 use serde::Serialize;
 use uuid::Uuid;
 

src/template_helpers.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use std::path::{Path, PathBuf};
 
-use handlebars::Handlebars;
+use rocket_dyn_templates::handlebars::Handlebars;
 
 use crate::i18n::I18NHelper;
 use crate::web::get_i18n;

src/web/mod.rs

@@ -1412,14 +1412,10 @@ pub mod tests {
     }
 
     fn vks_publish_submit_response<'a>(client: &'a Client, data: &[u8]) -> LocalResponse<'a> {
-        let ct = ContentType::with_params(
-            "multipart",
-            "form-data",
-            (
-                "boundary",
-                "---------------------------14733842173518794281682249499",
-            ),
-        );
+        let ct = ContentType::new("multipart", "form-data").with_params((
+            "boundary",
+            "---------------------------14733842173518794281682249499",
+        ));
 
         let header = b"-----------------------------14733842173518794281682249499\r\n\
               Content-Disposition: form-data; name=\"csrf\"\r\n\