Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the ? operator #124

Merged
merged 2 commits into from
May 30, 2017
Merged

Use the ? operator #124

merged 2 commits into from
May 30, 2017

Conversation

ashfordneil
Copy link
Contributor

See #110 - replaced try! with ?

Thoughts?

@illegalprime
Copy link
Collaborator

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.

@ashfordneil ashfordneil force-pushed the master branch 3 times, most recently from 8e8dc2d to 0c49ab5 Compare May 17, 2017 04:48
@illegalprime
Copy link
Collaborator

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
Copy link
Collaborator

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

@ashfordneil ashfordneil force-pushed the master branch 4 times, most recently from 8669ed0 to 6e0ada6 Compare May 30, 2017 07:27
@ashfordneil
Copy link
Contributor Author

ashfordneil commented May 30, 2017

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
Copy link
Collaborator

@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.

@illegalprime illegalprime merged commit 8049282 into websockets-rs:master May 30, 2017
@illegalprime illegalprime mentioned this pull request May 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants