Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-23 21:23:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some more stutter warnings

Browse source
This commit is contained in:
Devon Hollowood 2018-10-12 17:07:48 -07:00
parent 73ba33dd2b
commit 335bc1e820
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clippy_lints/src/double_comparison.rs
View file

@ -40,16 +40,15 @@ declare_clippy_lint! {
"unnecessary double comparisons that can be simplified" "unnecessary double comparisons that can be simplified"
} }
#[allow(clippy::stutter)] pub struct Pass;
pub struct DoubleComparisonPass;
impl LintPass for DoubleComparisonPass { impl LintPass for Pass {
fn get_lints(&self) -> LintArray { fn get_lints(&self) -> LintArray {
lint_array!(DOUBLE_COMPARISONS) lint_array!(DOUBLE_COMPARISONS)
} }
} }
impl<'a, 'tcx> DoubleComparisonPass { impl<'a, 'tcx> Pass {
#[allow(clippy::similar_names)] #[allow(clippy::similar_names)]
fn check_binop( fn check_binop(
&self, &self,
@ -89,7 +88,7 @@ impl<'a, 'tcx> DoubleComparisonPass {
} }
} }
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for DoubleComparisonPass { impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) { fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
if let ExprKind::Binary(ref kind, ref lhs, ref rhs) = expr.node { if let ExprKind::Binary(ref kind, ref lhs, ref rhs) = expr.node {
self.check_binop(cx, kind.node, lhs, rhs, expr.span); self.check_binop(cx, kind.node, lhs, rhs, expr.span);

4
clippy_lints/src/lib.rs
View file

@ -428,8 +428,8 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
reg.register_late_lint_pass(box fallible_impl_from::FallibleImplFrom); reg.register_late_lint_pass(box fallible_impl_from::FallibleImplFrom);
reg.register_late_lint_pass(box replace_consts::ReplaceConsts); reg.register_late_lint_pass(box replace_consts::ReplaceConsts);
reg.register_late_lint_pass(box types::UnitArg); reg.register_late_lint_pass(box types::UnitArg);
reg.register_late_lint_pass(box double_comparison::DoubleComparisonPass); reg.register_late_lint_pass(box double_comparison::Pass);
reg.register_late_lint_pass(box question_mark::QuestionMarkPass); reg.register_late_lint_pass(box question_mark::Pass);
reg.register_late_lint_pass(box suspicious_trait_impl::SuspiciousImpl); reg.register_late_lint_pass(box suspicious_trait_impl::SuspiciousImpl);
reg.register_early_lint_pass(box multiple_crate_versions::Pass); reg.register_early_lint_pass(box multiple_crate_versions::Pass);
reg.register_late_lint_pass(box map_unit_fn::Pass); reg.register_late_lint_pass(box map_unit_fn::Pass);

9
clippy_lints/src/question_mark.rs
View file

@ -44,17 +44,16 @@ declare_clippy_lint!{
"checks for expressions that could be replaced by the question mark operator" "checks for expressions that could be replaced by the question mark operator"
} }
#[allow(clippy::stutter)]
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
pub struct QuestionMarkPass; pub struct Pass;
impl LintPass for QuestionMarkPass { impl LintPass for Pass {
fn get_lints(&self) -> LintArray { fn get_lints(&self) -> LintArray {
lint_array!(QUESTION_MARK) lint_array!(QUESTION_MARK)
} }
} }
impl QuestionMarkPass { impl Pass {
/// Check if the given expression on the given context matches the following structure: /// Check if the given expression on the given context matches the following structure:
/// ///
/// ```ignore /// ```ignore
@ -146,7 +145,7 @@ impl QuestionMarkPass {
} }
} }
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for QuestionMarkPass { impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) { fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
Self::check_is_none_and_early_return_none(cx, expr); Self::check_is_none_and_early_return_none(cx, expr);
} }