Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2025-02-17 06:28:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Apply suggestions from code review

Browse source 
Co-Authored-By: Philipp Krones <hello@philkrones.com>
This commit is contained in:
Shotaro Yamada 2020-03-04 12:59:58 +00:00 • committed by Shotaro Yamada
parent 246709f89e
commit a78a1fc97b
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
clippy_lints/src/question_mark.rs
View file

@ -8,7 +8,7 @@ use rustc_session::{declare_lint_pass, declare_tool_lint};
use crate::utils::paths::{OPTION, OPTION_NONE};
use crate::utils::sugg::Sugg;
use crate::utils::{
higher, match_def_path, match_qpath, match_type, snippet_with_applicability, span_lint_and_then, SpanlessEq,
higher, match_def_path, match_qpath, match_type, snippet_with_applicability, span_lint_and_sugg, SpanlessEq,
};
declare_clippy_lint! {
@ -58,7 +58,7 @@ impl QuestionMark {
then {
let mut applicability = Applicability::MachineApplicable;
let receiver_str = snippet_with_applicability(cx, subject.span, "..", &mut applicability);
let receiver_str = &Sugg::hir_with_applicability(cx, subject, "..", &mut applicability);
let mut replacement: Option<String> = None;
if let Some(else_) = else_ {
if_chain! {
@ -77,19 +77,14 @@ impl QuestionMark {
}
if let Some(replacement_str) = replacement {
span_lint_and_then(
span_lint_and_sugg(
cx,
QUESTION_MARK,
expr.span,
"this block may be rewritten with the `?` operator",
|db| {
db.span_suggestion(
expr.span,
"replace it with",
replacement_str,
applicability,
);
}
"replace it with",
replacement_str,
applicability,
)
}
}
@ -124,19 +119,14 @@ impl QuestionMark {
if by_ref { ".as_ref()" } else { "" },
);
span_lint_and_then(
span_lint_and_sugg(
cx,
QUESTION_MARK,
expr.span,
"this if-let-else may be rewritten with the `?` operator",
|db| {
db.span_suggestion(
expr.span,
"replace it with",
replacement,
applicability,
);
}
"replace it with",
replacement,
applicability,
)
}
}