Rust -master compat