Closed SnirkImmington closed 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.
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.
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.
In the future, I'll avoid editing the README or other meta/markdown files in a branch...
Alright, this patch gets my blessing. I'll let you do the honours of fixing the merge conflicts :+1:
The
version-stability
branch matches wlc's taggedv0.0.1
release. It contains the newcallback
module for callback-registering functions, and a few improvements.[f64; 2]
even though its numbers are weird.Cargo.lock
from the repository (and add to.gitignore
) - this is apparently bad practice for libraries.#[derive(Hash)]
forWlcOutput
,WlcView
,ButtonState
,KeyState
,Point
,Size
,Geometry
,Keysym
callback
module andinit2()
for wlc's new initialization APIrustwlc::exec
(use Rust standard library for that)After the merge