Make DiagEmitter::emit take self by value

Author: GuillaumeGomez

compiler/rustc_hir_analysis/src/lib.rs

@@ -157,15 +157,15 @@ pub fn emit_delayed_lint(lint: &DelayedLint, tcx: TyCtxt<'_>) {
     }
 
     impl rustc_lint::EmitDiag for DiagEmitter<'_> {
-        fn emit(&self, diag: impl for<'a> rustc_errors::Diagnostic<'a, ()>) {
+        fn emit(self, diag: impl for<'a> rustc_errors::Diagnostic<'a, ()>) {
             self.tcx.emit_node_span_lint(self.lint, self.hir_id, self.span, diag);
         }
     }
 
     match lint {
         DelayedLint::AttributeParsing(attribute_lint) => {
             rustc_lint::decorate_attribute_lint(
-                &DiagEmitter {
+                DiagEmitter {
                     hir_id: attribute_lint.id,
                     tcx,
                     span: attribute_lint.span,

compiler/rustc_lint/src/early.rs

@@ -34,7 +34,7 @@ pub struct EarlyContextAndPass<'ecx, 'tcx, T: EarlyLintPass> {
 }
 
 pub trait EmitDiag {
-    fn emit(&self, diag: impl for<'a> Diagnostic<'a, ()>);
+    fn emit(self, diag: impl for<'a> Diagnostic<'a, ()>);
 }
 
 struct DiagEmitter<'a, 'b> {
@@ -44,8 +44,8 @@ struct DiagEmitter<'a, 'b> {
 }
 
 impl EmitDiag for DiagEmitter<'_, '_> {
-    fn emit(&self, diag: impl for<'a> Diagnostic<'a, ()>) {
-        self.ctx.opt_span_diag_lint(self.lint, self.span.clone(), diag);
+    fn emit(self, diag: impl for<'a> Diagnostic<'a, ()>) {
+        self.ctx.opt_span_diag_lint(self.lint, self.span, diag);
     }
 }
 
@@ -56,7 +56,7 @@ impl<'ecx, 'tcx, T: EarlyLintPass> EarlyContextAndPass<'ecx, 'tcx, T> {
             match diagnostic {
                 DecorateDiagCompat::Builtin(b) => {
                     diagnostics::decorate_builtin_lint(
-                        &DiagEmitter { ctx: &self.context, span, lint: lint_id.lint },
+                        DiagEmitter { ctx: &self.context, span, lint: lint_id.lint },
                         self.context.sess(),
                         self.tcx,
                         b,

compiler/rustc_lint/src/early/diagnostics.rs

@@ -14,8 +14,8 @@ use crate::{EmitDiag, lints};
 
 mod check_cfg;
 
-pub fn decorate_builtin_lint<D: EmitDiag>(
-    ctx: &D,
+pub fn decorate_builtin_lint(
+    ctx: impl EmitDiag,
     sess: &Session,
     tcx: Option<TyCtxt<'_>>,
     diagnostic: BuiltinLintDiag,
@@ -298,8 +298,8 @@ pub fn decorate_builtin_lint<D: EmitDiag>(
     }
 }
 
-pub fn decorate_attribute_lint<D: EmitDiag>(
-    ctx: &D,
+pub fn decorate_attribute_lint(
+    ctx: impl EmitDiag,
     sess: &Session,
     tcx: Option<TyCtxt<'_>>,
     kind: &AttributeLintKind,