Bump iron-fork to 0.3.0 (and remove .cargo) #411
Conversation
|
Upgrading iron-fork to 0.3.0 turned out to be easier than I thought. The only changes made since we forked were located in Cargo.toml (and the ones made for SNI in iron-fork/src/iron.rs). r? @samgiles |
|
@samgiles any hope to upstream your changes? |
|
@fabricedesre Not as it is right now - there are 4 different implementations to achieve the same thing, I have an API suggestion completely different from my implementtion on my PR from a maintainer. I just need to do that - and then hopefully we'll get a merge. |
|
@JohanLorenzo lgtm! Thanks. |
|
Changes Unknown when pulling 1ddeb8f on JohanLorenzo:remove-.cargo into * on fxbox:master*. |
It also removes .cargo. Fixes #367
|
Changes Unknown when pulling 33af32f on JohanLorenzo:remove-.cargo into * on fxbox:master*. |
|
Rebased on top of master. I had to also specify the "replace" in subcrates. I also had to fork ws-rs, in order to have the mio revisions matching https://github.com/JohanLorenzo/ws-rs/blob/0.4.6/Cargo.toml#L15 |
| time = "0.1" | ||
| timer = "0.1.6" | ||
| uuid = "0.1.18" | ||
| url = "0.5.7" | ||
| ws = { git = "https://github.com/housleyjk/ws-rs.git", rev = "d154fc5" } | ||
| ws = { git = "https://github.com/JohanLorenzo/ws-rs.git" , branch = "0.4.6" } |
There was a problem hiding this comment.
Needed, otherwise mio version mismatch.
- https://crates.io/crates/ws/0.4.6 uses mio 0.5.0
- whereas we use 0.5.0, but with some revisions forward https://github.com/fxbox/foxbox/pull/411/files#diff-80398c5faae3c069e4e6aa2ed11b28c0R42
Fixes #367