remove http-service patches (#297)

* remove http-service patches Signed-off-by: Yoshua Wuyts <[email protected]> * try fix build Signed-off-by: Yoshua Wuyts <[email protected]>
http-rs · Jul 26, 2019 · dfef176 · dfef176
1 parent 3a7601f
commit dfef176
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: rust
 rust: nightly-2019-07-08
-cache: cargo
 
 before_script:
 - >

diff --git a/Cargo.toml b/Cargo.toml
@@ -27,8 +27,8 @@ hyper = ["http-service-hyper"]
 [dependencies]
 futures-preview = "0.3.0-alpha.17"
 http = "0.1"
-http-service = "0.2.0"
-http-service-hyper = { version = "0.2.0", optional = true }
+http-service = "0.3.0"
+http-service-hyper = { version = "0.4.0", optional = true }
 # Routing
 fnv = "1.0.6"
 route-recognizer = "0.1.12"
@@ -47,7 +47,7 @@ cookie = { version = "0.12", features = ["percent-encode"] }
 env_logger = "0.6.1"
 futures-fs = "0.0.5"
 futures-util-preview = { version = "0.3.0-alpha.17", features = ["compat"] }
-http-service-mock = "0.2.0"
+http-service-mock = "0.3.0"
 juniper = "0.13.0"
 log = "0.4.6"
 log4rs = "0.8.3"
@@ -73,8 +73,3 @@ members = [
     "tide-querystring",
     "tide-slog",
 ]
-
-[patch.crates-io]
-http-service = { git = "https://github.com/rustasync/http-service", branch = "master" }
-http-service-hyper = { git = "https://github.com/rustasync/http-service", branch = "master" }
-http-service-mock = { git = "https://github.com/rustasync/http-service", branch = "master" }
diff --git a/tide-compression/Cargo.toml b/tide-compression/Cargo.toml
@@ -19,7 +19,7 @@ accept-encoding = "0.2.0-alpha.2"
 bytes = "0.4.12"
 futures-preview = "0.3.0-alpha.17"
 http = "0.1"
-http-service = "0.2.0"
+http-service = "0.3.0"
 
 [dependencies.async-compression]
 default-features = false
@@ -28,4 +28,4 @@ version = "0.1.0-alpha.1"
 
 [dev-dependencies]
 tide = { path = "../", default-features = false }
-http-service-mock = "0.2.0"
+http-service-mock = "0.3.0"
diff --git a/tide-cookies/Cargo.toml b/tide-cookies/Cargo.toml
@@ -14,9 +14,9 @@ repository = "https://github.com/rustasync/tide"
 cookie = { version = "0.12", features = ["percent-encode"] }
 futures-preview = "0.3.0-alpha.17"
 http = "0.1"
-http-service = "0.2.0"
+http-service = "0.3.0"
 tide-core = { path = "../tide-core", default-features = false  }
 
 [dev-dependencies]
 tide = { path = "../", default-features = false }
-http-service-mock = "0.2.0"
+http-service-mock = "0.3.0"
diff --git a/tide-core/Cargo.toml b/tide-core/Cargo.toml
@@ -13,7 +13,7 @@ repository = "https://github.com/rustasync/tide"
 [dependencies]
 futures-preview = "0.3.0-alpha.17"
 http = "0.1"
-http-service = "0.2.0"
+http-service = "0.3.0"
 serde = "1.0.91"
 serde_json = "1.0.39"
 route-recognizer = "0.1.12"

diff --git a/tide-cors/Cargo.toml b/tide-cors/Cargo.toml
@@ -16,9 +16,9 @@ edition = "2018"
 [dependencies]
 futures-preview = "0.3.0-alpha.17"
 http = "0.1"
-http-service = "0.2.0"
+http-service = "0.3.0"
 tide-core = { path = "../tide-core" }
 
 [dev-dependencies]
 tide = { path = "../" }
-http-service-mock = "0.2.0"
+http-service-mock = "0.3.0"
diff --git a/tide-forms/Cargo.toml b/tide-forms/Cargo.toml
@@ -18,7 +18,7 @@ version = "0.1.0"
 
 [dependencies]
 tide-core = { path = "../tide-core", default-features = false  }
-http-service = "0.2.0"
+http-service = "0.3.0"
 futures-preview = "0.3.0-alpha.17"
 http = "0.1"
 log = "0.4.6"

diff --git a/tide-querystring/Cargo.toml b/tide-querystring/Cargo.toml
@@ -26,6 +26,5 @@ serde_urlencoded = "0.5.5"
 
 [dev-dependencies]
 tide = { path = "../", default-features = false }
-http-service = "0.2.0"
-http-service-mock = "0.2.0"
-
+http-service = "0.3.0"
+http-service-mock = "0.3.0"