way-cooler / rust-wlc

[DEPRECATED] Rust bindings for wlc, the Wayland compositor library
54 stars 12 forks source link

Update to wlc version 0.0.1 #31

Closed SnirkImmington closed 8 years ago

SnirkImmington commented 8 years ago

The version-stability branch matches wlc's tagged v0.0.1 release. It contains the new callback module for callback-registering functions, and a few improvements.

SnirkImmington commented 8 years ago

@Timidger re: rustfmt: I will run master through rustfmt after the merge. It's not worth keeping in a separate branch (it's merge-conflict-tastic), and doing it now would probably make the merge even more conflicted. It's about time we used it (and those long lines are embarrassing, my bad) but it'll be easier git-wise for me to add rustfmt config to master after this and fix it up in one commit to keep the history simple.

Timidger commented 8 years ago

The merge errors are in the README. This probably would not have happened if you had rebased instead of merging and manually fixing the conflicts there, but it's a small issue so I can fix it manually once the changes I have suggested have been discussed.

SnirkImmington commented 8 years ago

Okay, once again, sorry about sucking at git, I'll do my best to rebase more in the future. I can clean up the mess I caused.

I'll add in the changes I've been working on this weekend.

SnirkImmington commented 8 years ago

In the future, I'll avoid editing the README or other meta/markdown files in a branch...

Timidger commented 8 years ago

Alright, this patch gets my blessing. I'll let you do the honours of fixing the merge conflicts :+1: