update to compile with rust nightly 2014-12-23