maq/sn0int
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert rocket workaround again

Browse Source 
https://github.com/SergioBenitez/Rocket/issues/905
This commit is contained in:
kpcyrd
2019-04-24 13:47:39 +02:00
parent 1068fccf0f
commit 3c2386ff48
3 changed files with 890 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

881
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

12
Cargo.toml
View File

@@ -21,9 +21,9 @@ travis-ci = { repository = "kpcyrd/sn0int" }
[workspace]
# rocket is broken and blocks the whole workspace, removing
#members = ["sn0int-registry/sn0int-common",
# "sn0int-registry"]
members = ["sn0int-registry/sn0int-common"]
members = ["sn0int-registry/sn0int-common",
"sn0int-registry"]
#members = ["sn0int-registry/sn0int-common"]
[dependencies]
sn0int-common = { version="0.6.0", path="sn0int-registry/sn0int-common" }
@@ -100,6 +100,6 @@ unveil = "0.2.0"
boxxy = "0.9"
tempfile = "3.0"
#[patch.crates-io]
#rocket = { git = "https://github.com/SergioBenitez/Rocket.git", rev="c86f4312fb273c0380fb76a97bfb7fc227800542" }
#rocket_contrib = { git = "https://github.com/SergioBenitez/Rocket.git", rev="c86f4312fb273c0380fb76a97bfb7fc227800542" }
[patch.crates-io]
rocket = { git = "https://github.com/SergioBenitez/Rocket.git", rev="c86f4312fb273c0380fb76a97bfb7fc227800542" }
rocket_contrib = { git = "https://github.com/SergioBenitez/Rocket.git", rev="c86f4312fb273c0380fb76a97bfb7fc227800542" }

6
sn0int-registry/Cargo.toml
View File

@@ -34,6 +34,6 @@ serde_json = "1.0"
dotenv = "0.13"
[patch.crates-io]
rocket = { git = "https://github.com/SergioBenitez/Rocket.git", rev="c86f4312fb273c0380fb76a97bfb7fc227800542" }
rocket_contrib = { git = "https://github.com/SergioBenitez/Rocket.git", rev="c86f4312fb273c0380fb76a97bfb7fc227800542" }
#[patch.crates-io]
#rocket = { git = "https://github.com/SergioBenitez/Rocket.git", rev="c86f4312fb273c0380fb76a97bfb7fc227800542" }
#rocket_contrib = { git = "https://github.com/SergioBenitez/Rocket.git", rev="c86f4312fb273c0380fb76a97bfb7fc227800542" }