Updated code to latest rustc
Update to latest rustc