From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 Jul 2020 02:47:46 +0000 (+0100)
Subject: builds with our rocket arrgh
X-Git-Tag: otter-0.2.0~1454
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8d23b46a615ac178f69dc00ff35c474069557cb8;p=otter.git

builds with our rocket arrgh
---

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 8a48c2d8..4b35f6b0 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -938,6 +938,7 @@ checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
 [[package]]
 name = "rocket"
 version = "0.4.5"
+source = "git+file:///home/ian/Rustup/Game/rocket/.git?branch=Game-rocket#8acfb5a6a2cf42c4233bc5c56e0816cd89035345"
 dependencies = [
  "atty",
  "base64 0.12.3",
@@ -957,6 +958,7 @@ dependencies = [
 [[package]]
 name = "rocket_codegen"
 version = "0.4.5"
+source = "git+file:///home/ian/Rustup/Game/rocket/.git?branch=Game-rocket-codegen#0775bdde13ea5253913c2d21938630f4230fa030"
 dependencies = [
  "devise",
  "glob 0.3.0",
@@ -970,6 +972,7 @@ dependencies = [
 [[package]]
 name = "rocket_contrib"
 version = "0.4.5"
+source = "git+file:///home/ian/Rustup/Game/rocket/.git?branch=Game-rocket-contrib#023e80804a8b5583c7ab828b5b4237b4d7a8b143"
 dependencies = [
  "glob 0.3.0",
  "log 0.4.8",
@@ -984,6 +987,7 @@ dependencies = [
 [[package]]
 name = "rocket_http"
 version = "0.4.5"
+source = "git+file:///home/ian/Rustup/Game/rocket/.git?branch=Game-rocket-http#ae2884c91a8b9916a3544c5e4ced78f10fa505e4"
 dependencies = [
  "cookie",
  "hyper",
diff --git a/Cargo.toml b/Cargo.toml
index 0a56662b..d25a5edf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,10 +34,10 @@ index_vec = "0.1.1"
 num-traits = "0.2"
 
 #rocket = "0.4"
-#rocket_contrib = { version = "0.4", default-features=false, features=["tera_templates","helmet","json"] }
+rocket_contrib = { version = "0.4", default-features=false, features=["tera_templates","helmet","json"], git = "file:///home/ian/Rustup/Game/rocket/.git" branch = "Game-rocket-contrib" }
+
+rocket = { git = "file:///home/ian/Rustup/Game/rocket/.git", branch = "Game-rocket" }
 
-rocket = { path = "/home/ian/Rustup/Game/rocket/core/lib" }
-rocket_contrib = { path = "/home/ian/Rustup/Game/rocket/contrib/lib", default-features=false, features=["tera_templates","helmet","json"] }
 
 vecdeque-stableix = "0"
 
@@ -46,3 +46,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"] }
+#rocket_contrib_codegen = { git = "file:///home/ian/Rustup/Game/rocket/.git" branch = "Game-rocket-contrib-codegen" }
+
+