remove workaround for rwf2/Rocket#513

rustodon · Apr 1, 2018 · bd1368b · bd1368b
1 parent cca5383
commit bd1368b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,8 +15,8 @@ lazy_static = "1.0"
 itertools = "0.7.4"
 resopt = { path = "lib/resopt/" }
 
-rocket = { git = "https://github.com/SergioBenitez/Rocket", branch = "v0.3" }
-rocket_codegen = { git = "https://github.com/SergioBenitez/Rocket", branch = "v0.3" }
+rocket = "0.3.6"
+rocket_codegen = "0.3.6"
 
 serde = "1.0"
 serde_derive = "1.0"
@@ -30,14 +30,10 @@ maud = { version = "0.17.2", features = ["rocket"] }
 path = "database/"
 
 [dependencies.rocket_contrib]
-git = "https://github.com/SergioBenitez/Rocket"
-branch = "v0.3"
+version = "0.3.6"
 default-features = false
 features = ["json"]
 
 [dev-dependencies]
 clippy = ">= 0"
 
-[patch.crates-io]
-rocket = { git = "https://github.com/SergioBenitez/Rocket", branch = "v0.3" }
-ring = { git = "https://github.com/SergioBenitez/ring", branch = "v0.11" }
diff --git a/database/Cargo.toml b/database/Cargo.toml
@@ -12,7 +12,7 @@ diesel_infer_schema = { version = "1.0.0", features = ["postgres"] }
 r2d2 = "0.8.1"
 r2d2-diesel = "1.0.0"
 
-rocket = { git = "https://github.com/SergioBenitez/Rocket", branch = "v0.3" }
+rocket = "0.3.6"
 
 pwhash = "0.1.2"
 chrono = "0.4"