Fixed master to follow the changes in rustc

This works as with 02/06/2014 rustc.