Merge pull request #1032 from jkczyz/2021-08-clippy