TEMP: progress porting to rustc master