rustc: De-XXX resolve and borrowck...

and remove an un-needed hashmap from resolve