fix build with Rust master
- str / strbuf / &str