Update for rustc as of 2014-07-11