From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 25 Jul 2020 18:35:26 +0000 (+0100)
Subject: Revert "get rid of daft rocket patch now nailing-cargo is better"
X-Git-Tag: otter-0.2.0~1267
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8846013454bae328ea9d461254c98110ac553273;p=otter.git

Revert "get rid of daft rocket patch now nailing-cargo is better"

We still need this because
  https://github.com/rust-lang/cargo/issues/8546

This reverts commit 883c05f721370cf16020cf635a61054223552985.
---

diff --git a/Cargo.toml b/Cargo.toml
index f3413568..213eadae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,11 +60,11 @@ vecdeque-stableix = "0"
 #sha2 = "0.8"
 #generic-array = "0.12"
 
-#[patch.crates-io]
-#rocket = { git = "file:///home/ian/Rustup/Game/rocket/.git", branch = "Game-rocket" }
-#rocket_codegen = { git = "file:///home/ian/Rustup/Game/rocket/.git" branch = "Game-rocket-codegen" }
-#rocket_http = { git = "file:///home/ian/Rustup/Game/rocket/.git" branch = "Game-rocket-http" }
-#rocket_contrib = { git = "file:///home/ian/Rustup/Game/rocket/.git" branch = "Game-rocket-contrib", default-features=false, features=["tera_templates","helmet","json"] }
+[patch.crates-io]
+rocket = { git = "file:///home/ian/Rustup/Game/rocket/.git", branch = "Game-rocket" }
+rocket_codegen = { git = "file:///home/ian/Rustup/Game/rocket/.git" branch = "Game-rocket-codegen" }
+rocket_http = { git = "file:///home/ian/Rustup/Game/rocket/.git" branch = "Game-rocket-http" }
+rocket_contrib = { git = "file:///home/ian/Rustup/Game/rocket/.git" branch = "Game-rocket-contrib", default-features=false, features=["tera_templates","helmet","json"] }
 #rocket_contrib_codegen = { git = "file:///home/ian/Rustup/Game/rocket/.git" branch = "Game-rocket-contrib-codegen" }