Revert "Resolve clippy pedantic lints"

This reverts commit 34f3aeb.

Author: dtolnay

src/lib.rs

@@ -307,7 +307,6 @@
  clippy::default_trait_access,
  clippy::doc_markdown,
  clippy::if_not_else,
- clippy::items_after_statements,
  clippy::match_like_matches_macro,
  clippy::module_name_repetitions,
  clippy::shadow_unrelated,

src/receiver.rs

@@ -88,6 +88,16 @@ impl VisitMut for HasSelf {
 pub struct ReplaceSelf(pub Span);
 
 impl ReplaceSelf {
+ fn prepend_underscore_to_self(&self, ident: &mut Ident) -> bool {
+ let modified = ident == "self";
+ if modified {
+ *ident = Ident::new("__self", ident.span());
+ #[cfg(self_span_hack)]
+ ident.set_span(self.0);
+ }
+ modified
+ }
+
  fn visit_token_stream(&mut self, tokens: &mut TokenStream) -> bool {
  let mut out = Vec::new();
  let mut modified = false;
@@ -106,7 +116,7 @@ impl ReplaceSelf {
  for tt in tokens {
  match tt {
  TokenTree::Ident(mut ident) => {
- *modified |= prepend_underscore_to_self(&mut ident);
+ *modified |= visitor.prepend_underscore_to_self(&mut ident);
  out.push(TokenTree::Ident(ident));
  }
  TokenTree::Group(group) => {
@@ -125,7 +135,7 @@ impl ReplaceSelf {
 
 impl VisitMut for ReplaceSelf {
  fn visit_ident_mut(&mut self, i: &mut Ident) {
- prepend_underscore_to_self(i);
+ self.prepend_underscore_to_self(i);
  }
 
  fn visit_item_mut(&mut self, i: &mut Item) {
@@ -149,13 +159,3 @@ impl VisitMut for ReplaceSelf {
  }
  }
 }
-
-fn prepend_underscore_to_self(ident: &mut Ident) -> bool {
- let modified = ident == "self";
- if modified {
- *ident = Ident::new("__self", ident.span());
- #[cfg(self_span_hack)]
- ident.set_span(self.0);
- }
- modified
-}