Update to rust master

Fixes compilation on rustc 0.13.0-nightly (7e11b2271 2014-12-24 20:47:12 +0000)