From 6fa9bf64d73d90ec35f30dcbb7d77f7418fff071 Mon Sep 17 00:00:00 2001 From: mcarton Date: Wed, 13 Jan 2016 17:17:19 +0100 Subject: Use span_suggestion in ENTRY lint --- src/entry.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/entry.rs b/src/entry.rs index 1885bea164b..d9fb7269be6 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -1,7 +1,7 @@ use rustc::lint::*; use rustc_front::hir::*; use syntax::codemap::Span; -use utils::{get_item_name, is_exp_equal, match_type, snippet, span_help_and_lint, walk_ptrs_ty}; +use utils::{get_item_name, is_exp_equal, match_type, snippet, span_lint_and_then, walk_ptrs_ty}; use utils::{BTREEMAP_PATH, HASHMAP_PATH}; /// **What it does:** This lint checks for uses of `contains_key` + `insert` on `HashMap` or @@ -92,20 +92,21 @@ fn check_for_insert(cx: &LateContext, span: Span, map: &Expr, key: &Expr, expr: is_exp_equal(cx, key, ¶ms[1]) ], { let help = if sole_expr { - format!("Consider using `{}.entry({}).or_insert({})`", + format!("{}.entry({}).or_insert({})", snippet(cx, map.span, ".."), snippet(cx, params[1].span, ".."), snippet(cx, params[2].span, "..")) } else { - format!("Consider using `{}.entry({})`", + format!("{}.entry({})", snippet(cx, map.span, ".."), snippet(cx, params[1].span, "..")) }; - span_help_and_lint(cx, MAP_ENTRY, span, - &format!("usage of `contains_key` followed by `insert` on `{}`", kind), - &help); + span_lint_and_then(cx, MAP_ENTRY, span, + &format!("usage of `contains_key` followed by `insert` on `{}`", kind), |db| { + db.span_suggestion(span, "Consider using", help.clone()); + }); } } } -- cgit 1.4.1-3-g733a5