lint #1674: replace struct name with `Self` when applicable
This crate contains Clippy lints. For the main crate, check cargo.io or GitHub.
