Merge pull request #96 from pehala/rust_url

Migrate from using 3scale rust-url fork
3scale · Jun 13, 2023 · 23a20ee · 23a20ee
2 parents 4d35b58 + dfaa243
commit 23a20ee
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,19 +30,15 @@ prng_pcg32 = ["rand_pcg"]
 prng_xoshiro128 = ["rand_xoshiro"]
 prng_xorshift = ["rand_xorshift"]
 
-[patch.crates-io]
-url = { git = "https://github.com/3scale-rs/rust-url", branch = "3scale" }
-percent-encoding = { git = "https://github.com/3scale-rs/rust-url", branch = "3scale" }
-
 [dependencies]
 proxy-wasm = { git = "https://github.com/3scale/proxy-wasm-rust-sdk", branch = "3scale" }
 log = "^0.4"
 serde = { version = "^1", features = ["derive"] }
 threescalers = { version = "^0.8", features = ["std", "xml-response", "rest-mappings", "rest-mappings-serde"]}
-straitjacket = { git = "https://github.com/3scale-rs/straitjacket", branch = "master" }
+straitjacket = { git = "https://github.com/3scale-rs/straitjacket", tag = "v0.2.0" }
 anyhow = "^1"
 thiserror = "^1"
-url = { git = "https://github.com/3scale-rs/rust-url", branch = "3scale", features = ["serde"] }
+url = { version = "^2.4", features = ["serde"] }
 regex = { version = "^1", default-features = false, features = ["std", "perf"] }
 base64 = "^0.21"
 prost = { version = "^0.11", features = ["prost-derive"] }