updated to latest rustc
added map