Port to the latest Rust closure notation