Update for Rust 0.11
Coding-style update