Skip to content

Commit d5af21d

Browse files
committed
Switch off of rust-postgres fork
rust-postgres no longer depends on Rust's liburl, so it no longer conflicts with servo's liburl.
1 parent f101387 commit d5af21d

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ git = "https://github.com/conduit-rust/conduit-middleware"
4040
git = "https://github.com/conduit-rust/conduit-cookie"
4141

4242
[dependencies.postgres]
43-
git = "https://github.com/alexcrichton/rust-postgres"
44-
branch = "servo-url"
43+
git = "https://github.com/sfackler/rust-postgres"
4544

4645
[dependencies.html]
4746
path = "src/html"
@@ -81,8 +80,7 @@ git = "https://github.com/rust-lang/semver"
8180
git = "https://github.com/servo/rust-url"
8281

8382
[dependencies.r2d2_postgres]
84-
git = "https://github.com/alexcrichton/r2d2-postgres"
85-
branch = "alexcrichton"
83+
git = "https://github.com/sfackler/r2d2-postgres"
8684

8785
[dependencies.git2]
8886
git = "https://github.com/alexcrichton/git2-rs"

src/migrate/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ name = "migrate"
88
path = "lib.rs"
99

1010
[dependencies.postgres]
11-
git = "https://github.com/alexcrichton/rust-postgres"
12-
branch = "servo-url"
11+
git = "https://github.com/sfackler/rust-postgres"

0 commit comments

Comments
 (0)