From c0c44360112e4574954c8016c59847a3f651bdaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96mer=20Sinan=20A=C4=9Facan?= <omeragacan@gmail.com>
Date: Mon, 22 Feb 2021 16:55:20 +0300
Subject: [PATCH] Remove a redundant macro
Turn the macro into a function. Also remove unused 'span' argument.
---
.../rustc_typeck/src/check/method/suggest.rs | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/compiler/rustc_typeck/src/check/method/suggest.rs b/compiler/rustc_typeck/src/check/method/suggest.rs
index 721e8ec54f0..e6c551ff4d4 100644
--- a/compiler/rustc_typeck/src/check/method/suggest.rs
+++ b/compiler/rustc_typeck/src/check/method/suggest.rs
@@ -517,21 +517,21 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
if self.is_fn_ty(&rcvr_ty, span) {
- macro_rules! report_function {
- ($span:expr, $name:expr) => {
- err.note(&format!(
- "`{}` is a function, perhaps you wish to call it",
- $name
- ));
- };
+ fn report_function<T: std::fmt::Display>(
+ err: &mut DiagnosticBuilder<'_>,
+ name: T,
+ ) {
+ err.note(
+ &format!("`{}` is a function, perhaps you wish to call it", name,),
+ );
}
if let SelfSource::MethodCall(expr) = source {
if let Ok(expr_string) = tcx.sess.source_map().span_to_snippet(expr.span) {
- report_function!(expr.span, expr_string);
+ report_function(&mut err, expr_string);
} else if let ExprKind::Path(QPath::Resolved(_, ref path)) = expr.kind {
if let Some(segment) = path.segments.last() {
- report_function!(expr.span, segment.ident);
+ report_function(&mut err, segment.ident);
}
}
}