search

websockets-rs / rust-websocket

A WebSocket (RFC6455) library written in Rust
http://websockets-rs.github.io/rust-websocket/
MIT License
1.55k stars 223 forks source link

Use the ? operator #124

Closed ashfordneil closed 7 years ago

ashfordneil commented 7 years ago

See #110 - replaced try! with ?

Thoughts?

illegalprime commented 7 years ago

git grep 'try!' doesn't show anything, I'm satisfied! Thanks! Please rebase your latest commit on top of the current master then force push, also remember to run cargo fmt (install it with cargo install rustfmt) so the diff doesn't show any style changes, only functional changes.

illegalprime commented 7 years ago

Hey @ashfordneil thanks for the cargo fmt! Can you please remove these commits from your PR:

  1. removed rust serialize 73f0525
  2. Merge branch 'master' of https://github.com/cyderize/rust-websocket 692773a

After that it'll be good to merge! Thanks!

illegalprime commented 7 years ago

@ashfordneil could you rebase on top of the new changes?

ashfordneil commented 7 years ago

Re: cargo fmt issues -- I've been running rustfmt 0.8.4 locally, but travis uses 0.8.1. By disabling the cache, I can get travis to use the up-to-date version (which says the code is fine), but I don't know how to cache the up-to-date version. Any ideas on what to do about this?

illegalprime commented 7 years ago

@ashfordneil nice catch, yeah to avoid these issues I think cargo should either always update and not cache OR it should cache and always use one version.