Skip to content

Commit 46d1ad0

Browse files
committed
Revert rust-lang#1501 in a really roundabout way
The author of ring has chosen to yank all versions of that crate other than the most recent. This has had the effect of making it so that we cannot modify our `Cargo.toml` without breaking the build. The long term fix will be to get us on the latest version of cookie (which requires updating some unmaintained dependencies). I haven't looked into how much work that will be beyond confirming that it is not as simple as just changing the version number. Right now, this is blocking anything that requires updating an existing dependency, or adding a new dependency. So this is a quick fix to get our builds working again until we have the time to sort out updating everything between us and ring. Unfortunately, this isn't just as simple as reverting rust-lang#1501, since `[patch]` doesn't force cargo to resolve to yanked versions. It'll instead resolve to really old versions of `cookie` in an attempt to remove `ring` from our dependency tree.
1 parent 41af25d commit 46d1ad0

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

Cargo.lock

Lines changed: 9 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,6 @@ tokio-service = "0.1"
8989
dotenv = "0.11"
9090
diesel = { version = "1.3.0", features = ["postgres"] }
9191
diesel_migrations = { version = "1.3.0", features = ["postgres"] }
92+
93+
[patch.crates-io]
94+
cookie = { git = "https://github.com/sgrif/cookie-rs.git", branch = "v0.9" }

0 commit comments

Comments
 (0)