Port to current Rust

rustc 0.11.0 (767f4a7937c9f8a56cf4d1ac8fd111d481312f34 2014-07-12
09:21:39 +0000)