From f50ce6912a1916d1d7b465ac580c352376503d35 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Mon, 17 Jan 2022 14:16:47 +0100
Subject: [PATCH] cargo: use published rocket_i18n, hyperx

---
 Cargo.lock     | 26 +++++++++++++++++++++++++-
 Cargo.toml     |  6 +++---
 rust-toolchain |  2 +-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a144272..78d1944 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -937,6 +937,7 @@ dependencies = [
  "glob",
  "hagrid-database",
  "handlebars 1.1.0",
+ "hyperx",
  "lazy_static",
  "lettre",
  "multipart",
@@ -1115,7 +1116,7 @@ checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
 dependencies = [
  "base64 0.9.3",
  "httparse",
- "language-tags",
+ "language-tags 0.2.2",
  "log 0.3.9",
  "mime 0.2.6",
  "num_cpus",
@@ -1150,6 +1151,22 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyperx"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5617e92fc2f2501c3e2bc6ce547cad841adba2bae5b921c7e52510beca6d084c"
+dependencies = [
+ "base64 0.13.0",
+ "bytes",
+ "http",
+ "httpdate",
+ "language-tags 0.3.2",
+ "mime 0.3.16",
+ "percent-encoding 2.1.0",
+ "unicase 2.6.0",
+]
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -1334,6 +1351,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 
+[[package]]
+name = "language-tags"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -2476,6 +2499,7 @@ dependencies = [
 [[package]]
 name = "rocket_i18n"
 version = "0.5.0"
+source = "git+https://github.com/Plume-org/rocket_i18n?branch=go-async#e81b6f1d49db11ab0296f1bffd3ce444d81806a4"
 dependencies = [
  "gettext",
  "rocket",
diff --git a/Cargo.toml b/Cargo.toml
index 72e31b4..6a37cb8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,11 +40,11 @@ gettext-utils = "0.1"
 gettext = "0.4"
 glob = "0.3"
 rfc2047 = "0.1"
+hyperx = "1.4"
 
 [dependencies.rocket_i18n]
-path = "../rocket_i18n"
-# git = "https://github.com/Plume-org/rocket_i18n"
-# branch = "go-async"
+git = "https://github.com/Plume-org/rocket_i18n"
+branch = "go-async"
 default-features = false
 features = ["rocket"]
 
diff --git a/rust-toolchain b/rust-toolchain
index c6d365e..69478d1 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2022-01-04
+1.58.1