Formatting, cleanup and Rust 2021 compatibility

Created by  pmeunier  2 days ago
7Q4257EPUSDGELWJYF23GKUXGJGOB2QJGPKN3JS3C272IEX6EQ2QC
Change contents