Update to rust master

Not entirely sure why this is necessary, it looks to be a regression in upstream
rustc?
Merge pull request #6 from alexcrichton/update

Update to rust master