Update to rust master (corresponding to https://github.com/rust-lang/rust/commit/b60de4bfc2cf45ebe16b9b5b768f0aad54211625)