Merge pull request #4 from CryZe/match-rustc

Update to match rust-lang/rust#36059