Fix building with current rustc
Merge pull request #22 from dotdash/rustup

Fix building with current rustc