updates for rust nightly (pre 0.11)