chiark / gitweb /
Revert "get rid of daft rocket patch now nailing-cargo is better"
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 25 Jul 2020 18:35:26 +0000 (19:35 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 25 Jul 2020 18:35:26 +0000 (19:35 +0100)
We still need this because
  https://github.com/rust-lang/cargo/issues/8546

This reverts commit 883c05f721370cf16020cf635a61054223552985.

Cargo.toml

index f34135687e43da134990b26a50d8d2e5dd430f17..213eadaeed88cc6e425e63c709c6afa9c9f27e1a 100644 (file)
@@ -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" }