all: Port to satisfy latest clippy

[zeenix]

No description provided.

[coveralls]

Pull Request Test Coverage Report for Build 12119869189

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

• For more information on this, see Tracking coverage changes with pull request builds.
• To avoid this issue with future PRs, see these Recommended CI Configurations.
• For a quick fix, rebase this PR at GitHub. Your next report should be accurate.

Details

• 3 of 3 (100.0%) changed or added relevant lines in 2 files are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage remained the same at 57.257%

---

Totals
Change from base Build 12118921881:	0.0%
Covered Lines:	2797
Relevant Lines:	4885

---

💛 - Coveralls

[cgwalters]

Post-merge LGTM FWIW