rustc updates.
Fix hl-modules too
Merge pull request #26 from glennw/rustc-update

rustc updates.