Merge "Fix warnings in preparation for Rust 1.54.0"