rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Formatting and naming

Browse Source
This commit is contained in:
Philipp Krones
2020-04-19 20:38:07 +02:00
committed by GitHub
parent d7f1a1ed2b
commit 41115d994a
5 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clippy_lints/src/empty_enum.rs
View File

@@ -50,7 +50,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EmptyEnum {
EMPTY_ENUM, EMPTY_ENUM,
item.span, item.span,
"enum with no variants", "enum with no variants",
Some(item.span), None,
"consider using the uninhabited type `!` (never type) or a wrapper \ "consider using the uninhabited type `!` (never type) or a wrapper \
around it to introduce a type which can't be instantiated", around it to introduce a type which can't be instantiated",
); );

9
clippy_lints/src/loops.rs
View File

@@ -2473,7 +2473,8 @@ fn check_needless_collect<'a, 'tcx>(expr: &'tcx Expr<'_>, cx: &LateContext<'a, '
match_type(cx, ty, &paths::HASHMAP) { match_type(cx, ty, &paths::HASHMAP) {
if method.ident.name == sym!(len) { if method.ident.name == sym!(len) {
let span = shorten_needless_collect_span(expr); let span = shorten_needless_collect_span(expr);
span_lint_and_sugg(cx, span_lint_and_sugg(
cx,
NEEDLESS_COLLECT, NEEDLESS_COLLECT,
span, span,
NEEDLESS_COLLECT_MSG, NEEDLESS_COLLECT_MSG,
@@ -2484,7 +2485,8 @@ fn check_needless_collect<'a, 'tcx>(expr: &'tcx Expr<'_>, cx: &LateContext<'a, '
} }
if method.ident.name == sym!(is_empty) { if method.ident.name == sym!(is_empty) {
let span = shorten_needless_collect_span(expr); let span = shorten_needless_collect_span(expr);
span_lint_and_sugg(cx, span_lint_and_sugg(
cx,
NEEDLESS_COLLECT, NEEDLESS_COLLECT,
span, span,
NEEDLESS_COLLECT_MSG, NEEDLESS_COLLECT_MSG,
@@ -2496,7 +2498,8 @@ fn check_needless_collect<'a, 'tcx>(expr: &'tcx Expr<'_>, cx: &LateContext<'a, '
if method.ident.name == sym!(contains) { if method.ident.name == sym!(contains) {
let contains_arg = snippet(cx, args[1].span, "??"); let contains_arg = snippet(cx, args[1].span, "??");
let span = shorten_needless_collect_span(expr); let span = shorten_needless_collect_span(expr);
span_lint_and_then(cx, span_lint_and_then(
cx,
NEEDLESS_COLLECT, NEEDLESS_COLLECT,
span, span,
NEEDLESS_COLLECT_MSG, NEEDLESS_COLLECT_MSG,

1
clippy_lints/src/returns.rs
View File

@@ -291,7 +291,6 @@ impl EarlyLintPass for Return {
String::new(), String::new(),
Applicability::MachineApplicable, Applicability::MachineApplicable,
); );
} }
} }
} }

20
clippy_lints/src/utils/diagnostics.rs
View File

@@ -70,15 +70,15 @@ pub fn span_lint_and_help<'a, T: LintContext>(
help_span: Option<Span>, help_span: Option<Span>,
help: &str, help: &str,
) { ) {
cx.struct_span_lint(lint, span, |ldb| { cx.struct_span_lint(lint, span, |diag| {
let mut db = ldb.build(msg); let mut diag = diag.build(msg);
if let Some(help_span) = help_span { if let Some(help_span) = help_span {
db.span_help(help_span, help); diag.span_help(help_span, help);
} else { } else {
db.help(help); diag.help(help);
} }
docs_link(&mut db, lint); docs_link(&mut diag, lint);
db.emit(); diag.emit();
}); });
} }
@@ -111,12 +111,12 @@ pub fn span_lint_and_note<'a, T: LintContext>(
note_span: Option<Span>, note_span: Option<Span>,
note: &str, note: &str,
) { ) {
cx.struct_span_lint(lint, span, |ldb| { cx.struct_span_lint(lint, span, |diag| {
let mut db = ldb.build(msg); let mut diag = diag.build(msg);
if let Some(note_span) = note_span { if let Some(note_span) = note_span {
db.span_note(note_span, note); diag.span_note(note_span, note);
} else { } else {
db.note(note); diag.note(note);
} }
docs_link(&mut diag, lint); docs_link(&mut diag, lint);
diag.emit(); diag.emit();

23
clippy_lints/src/utils/internal_lints.rs
View File

@@ -163,25 +163,25 @@ declare_clippy_lint! {
/// *Example:** /// *Example:**
/// Bad: /// Bad:
/// ```rust,ignore /// ```rust,ignore
/// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| { /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |diag| {
/// db.span_suggestion( /// diag.span_suggestion(
/// expr.span, /// expr.span,
/// help_msg, /// help_msg,
/// sugg.to_string(), /// sugg.to_string(),
/// Applicability::MachineApplicable, /// Applicability::MachineApplicable,
/// ); /// );
/// }); /// });
/// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| { /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |diag| {
/// db.span_help(expr.span, help_msg); /// diag.span_help(expr.span, help_msg);
/// }); /// });
/// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| { /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |diag| {
/// db.help(help_msg); /// diag.help(help_msg);
/// }); /// });
/// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| { /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |diag| {
/// db.span_note(expr.span, note_msg); /// diag.span_note(expr.span, note_msg);
/// }); /// });
/// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| { /// span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |diag| {
/// db.note(note_msg); /// diag.note(note_msg);
/// }); /// });
/// ``` /// ```
/// ///
@@ -258,7 +258,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for LintWithoutLintPass {
if_chain! { if_chain! {
if let ExprKind::AddrOf(_, _, ref inner_exp) = expr.kind; if let ExprKind::AddrOf(_, _, ref inner_exp) = expr.kind;
if let ExprKind::Struct(_, ref fields, _) = inner_exp.kind; if let ExprKind::Struct(_, ref fields, _) = inner_exp.kind;
let field = fields.iter() let field = fields
.iter()
.find(|f| f.ident.as_str() == "desc") .find(|f| f.ident.as_str() == "desc")
.expect("lints must have a description field"); .expect("lints must have a description field");
if let ExprKind::Lit(Spanned { if let ExprKind::Lit(Spanned {