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

Run rustfmt #59

Merged
merged 1 commit into from
Apr 30, 2016
Merged

Run rustfmt #59

merged 1 commit into from
Apr 30, 2016

Conversation

jwilm
Copy link
Contributor

@jwilm jwilm commented Apr 29, 2016

I started working on another patch last evening, and couldn't figure out what style to use in the code. There was a mix of 2 space indents, 4 space indents, arguments aligned at the call parens, arguments aligned starting at next indent, trailing commas in field lists or not, and etc.

This was run with the default rustfmt configuration. If that's not to your liking, I won't be offended if you want to close this and run it with your own config, or you can let me know what you want changed and I can update this and add a rustfmt config.

In any case, please consider accepting this PR or running rustfmt and committing it yourself; it would really help me and other new contributors to get started!

Thank you! 😁


This change is Reviewable

@passcod
Copy link
Member

passcod commented Apr 30, 2016

That's cool, I've wanted to do this for a while. Should I merge this before your other PR or after? I.e. do they conflict?

@jwilm
Copy link
Contributor Author

jwilm commented Apr 30, 2016

They probably conflict, but it's probably easier to merge this one first. I'll rebase the other one afterwards.

Thanks!

@jwilm
Copy link
Contributor Author

jwilm commented Apr 30, 2016

Apparently git is able to merge without conflict by first merging the rustfmt branch followed by the fix-warnings branch.

@passcod passcod merged commit cf9cec0 into notify-rs:master Apr 30, 2016
@passcod passcod added this to the 2.6.0 milestone Jun 5, 2016
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