Merge pull request #276 from CoinFabrik/clippy-wrappers

 Moved to scout-audit-clippy-wrappers.

detectors/Cargo.toml

@@ -1,9 +1,10 @@
 [workspace]
-exclude = [".cargo", "target"]
+exclude = [".cargo", "target", ".vscode"]
 members = ["*"]
 
 [workspace.dependencies]
 clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "99c7838" }
+clippy_wrappers = { package = "scout-audit-clippy-wrappers-ink", git = "https://github.com/CoinFabrik/scout-audit/", rev = "e68a1bcccd0c3c65c8bbe3d6e7aa76f75abe8f92" }
 if_chain = "=1.0.2"
 itertools = { version = "=0.13" }
 scout-audit-dylint-linting = { git = "https://github.com/CoinFabrik/scout-audit", rev = "e03ede4" }

detectors/assert-violation/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/assert-violation/src/lib.rs

@@ -119,7 +119,7 @@ fn check_macro_call(cx: &EarlyContext, span: Span, mac: &P<MacCall>) {
     .iter()
     .any(|sym| &mac.path == sym)
     {
-        clippy_utils::diagnostics::span_lint_and_help(
+        clippy_wrappers::span_lint_and_help(
             cx,
             ASSERT_VIOLATION,
             span,

detectors/avoid-autokey-upgradable/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 itertools = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }

detectors/avoid-autokey-upgradable/src/lib.rs

@@ -5,6 +5,7 @@ extern crate rustc_error_messages;
 extern crate rustc_hir;
 extern crate rustc_span;
 
+use clippy_wrappers::span_lint_and_note;
 use itertools::Itertools;
 use rustc_error_messages::MultiSpan;
 use rustc_hir::GenericArg;
@@ -14,7 +15,6 @@ use rustc_hir::{
 };
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_span::Span;
-use clippy_utils::diagnostics::span_lint_and_note;
 
 scout_audit_dylint_linting::impl_late_lint! {
     pub AVOID_AUTOKEY_UPGRADABLE,

detectors/avoid-core-mem-forget/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/avoid-core-mem-forget/src/lib.rs

@@ -79,7 +79,7 @@ impl EarlyLintPass for AvoidStdCoreMemForget {
             if path.segments[1].ident.name.to_string() == "mem";
             if path.segments[2].ident.name.to_string() == "forget";
             then {
-                clippy_utils::diagnostics::span_lint_and_help(
+                clippy_wrappers::span_lint_and_help(
                     cx,
                     AVOID_STD_CORE_MEM_FORGET,
                     expr.span,

detectors/avoid-format-string/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/avoid-format-string/src/lib.rs

@@ -4,14 +4,14 @@
 extern crate rustc_ast;
 extern crate rustc_span;
 
+use clippy_utils::sym;
 use if_chain::if_chain;
 use rustc_ast::{
     tokenstream::{TokenStream, TokenTree},
     AttrArgs, AttrKind, Expr, ExprKind, Item,
 };
 use rustc_lint::{EarlyContext, EarlyLintPass};
 use rustc_span::{sym, Span};
-use clippy_utils::sym;
 
 const LINT_MESSAGE: &str = "The format! macro should not be used.";
 
@@ -93,7 +93,7 @@ impl EarlyLintPass for AvoidFormatString {
             if mac.path == sym!(format);
 
             then {
-                clippy_utils::diagnostics::span_lint_and_help(
+                clippy_wrappers::span_lint_and_help(
                     cx,
                     AVOID_FORMAT_STRING,
                     expr.span,

detectors/avoid-unsafe-block/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/avoid-unsafe-block/src/lib.rs

@@ -3,9 +3,9 @@
 extern crate rustc_ast;
 extern crate rustc_span;
 
+use clippy_wrappers::span_lint;
 use rustc_ast::{BlockCheckMode, Expr, ExprKind, UnsafeSource};
 use rustc_lint::{EarlyContext, EarlyLintPass};
-use clippy_utils::diagnostics::span_lint;
 
 const LINT_MESSAGE: &str = "Avoid using unsafe blocks as it may lead to undefined behavior.";
 scout_audit_dylint_linting::impl_pre_expansion_lint! {

detectors/buffering-unsized-types/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/buffering-unsized-types/src/lib.rs

@@ -5,14 +5,14 @@ extern crate rustc_hir;
 extern crate rustc_span;
 use std::collections::HashMap;
 
+use clippy_wrappers::span_lint_and_help;
 use rustc_hir::{
     intravisit::{walk_expr, Visitor},
     Expr, ExprKind, GenericArg, QPath, Ty, TyKind,
 };
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_span::symbol::Ident;
 use rustc_span::Span;
-use clippy_utils::diagnostics::span_lint_and_help;
 const LINT_MESSAGE: &str = "Do not use these method with an unsized (dynamically sized) type.";
 scout_audit_dylint_linting::impl_late_lint! {
     pub BUFFERING_UNSIZED_TYPES,

detectors/delegate-call/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/delegate-call/src/lib.rs

@@ -149,7 +149,7 @@ impl<'tcx> LateLintPass<'tcx> for DelegateCall {
         walk_expr(&mut delegate_storage, body.value);
 
         if delegate_storage.has_vulnerable_delegate {
-            clippy_utils::diagnostics::span_lint_and_help(
+            clippy_wrappers::span_lint_and_help(
                 cx,
                 DELEGATE_CALL,
                 delegate_storage.span.unwrap(),

detectors/divide-before-multiply/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
-
+clippy_wrappers = { workspace = true }
 clippy_utils = { workspace = true }
 
 [package.metadata.rust-analyzer]

detectors/divide-before-multiply/src/lib.rs

@@ -365,7 +365,7 @@ impl<'tcx> LateLintPass<'tcx> for DivideBeforeMultiply {
             );
 
             for span in spans {
-                clippy_utils::diagnostics::span_lint_and_help(
+                clippy_wrappers::span_lint_and_help(
                     cx,
                     DIVIDE_BEFORE_MULTIPLY,
                     span,
@@ -382,7 +382,7 @@ impl<'tcx> LateLintPass<'tcx> for DivideBeforeMultiply {
             if BinOpKind::Mul == op.node;
             then{
                 for division in get_divisions_inside_expr(expr) {
-                    clippy_utils::diagnostics::span_lint_and_help(
+                    clippy_wrappers::span_lint_and_help(
                         cx,
                         DIVIDE_BEFORE_MULTIPLY,
                         division,

detectors/dont-use-instantiate-contract-v1/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/dont-use-instantiate-contract-v1/src/lib.rs

@@ -60,7 +60,7 @@ impl<'tcx> LateLintPass<'tcx> for DontUseInstantiateContractV1 {
 
         visitor.has_instantiate_contract_v1_span.iter().for_each(|span| {
             if let Some(span) = span {
-                clippy_utils::diagnostics::span_lint_and_help(
+                clippy_wrappers::span_lint_and_help(
                     cx,
                     DONT_USE_INSTANTIATE_CONTRACT_V1,
                     *span,

detectors/dont-use-invoke-contract-v1/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/dont-use-invoke-contract-v1/src/lib.rs

@@ -60,7 +60,7 @@ impl<'tcx> LateLintPass<'tcx> for DontUseInvokeContractV1 {
 
         visitor.has_invoke_contract_v1_span.iter().for_each(|span| {
             if let Some(span) = span {
-                clippy_utils::diagnostics::span_lint_and_help(
+                clippy_wrappers::span_lint_and_help(
                     cx,
                     DONT_USE_INVOKE_CONTRACT_V1,
                     *span,

detectors/dos-unbounded-operation/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["cdylib"]
 [dependencies]
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
-
+clippy_wrappers = { workspace = true }
 clippy_utils = { workspace = true }
 
 [package.metadata.rust-analyzer]

detectors/dos-unbounded-operation/src/lib.rs

@@ -97,7 +97,7 @@ impl<'tcx> LateLintPass<'tcx> for DosUnboundedOperation {
             walk_expr(&mut visitor, body.value);
 
             for span in visitor.span_constant {
-                clippy_utils::diagnostics::span_lint_and_help(
+                clippy_wrappers::span_lint_and_help(
                     cx,
                     DOS_UNBOUNDED_OPERATION,
                     span,

detectors/dos-unexpected-revert-with-vector/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/dos-unexpected-revert-with-vector/src/lib.rs

@@ -216,12 +216,7 @@ impl<'tcx> LateLintPass<'tcx> for UnexpectedRevertWarn {
                 &mut HashSet::<BasicBlock>::default(),
             );
             for place in unchecked_places {
-                clippy_utils::diagnostics::span_lint(
-                    cx,
-                    UNEXPECTED_REVERT_WARN,
-                    place.1,
-                    LINT_MESSAGE,
-                );
+                clippy_wrappers::span_lint(cx, UNEXPECTED_REVERT_WARN, place.1, LINT_MESSAGE);
             }
         }
 

detectors/incorrect-exponentiation/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/incorrect-exponentiation/src/lib.rs

@@ -4,14 +4,14 @@
 extern crate rustc_hir;
 extern crate rustc_span;
 
+use clippy_wrappers::span_lint_and_help;
 use rustc_hir::def_id::LocalDefId;
 use rustc_hir::intravisit::Visitor;
 use rustc_hir::intravisit::{walk_expr, FnKind};
 use rustc_hir::{Body, FnDecl};
 use rustc_hir::{Expr, ExprKind};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_span::Span;
-use clippy_utils::diagnostics::span_lint_and_help;
 
 const LINT_MESSAGE: &str = "'^' It is not an exponential operator. It is a bitwise XOR.";
 const LINT_HELP: &str = "If you want to use XOR, use bitxor(). If you want to raise a number use .checked_pow() or .pow() ";

detectors/ink-version/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 semver = "1.0.4"

detectors/ink-version/src/lib.rs

@@ -53,7 +53,7 @@ impl EarlyLintPass for CheckInkVersion {
         let ink_version = VersionReq::parse(&ink_version.replace('\"', "")).unwrap();
 
         if !ink_version.matches(&req) {
-            clippy_utils::diagnostics::span_lint_and_help(
+            clippy_wrappers::span_lint_and_help(
                 cx,
                 CHECK_INK_VERSION,
                 rustc_span::DUMMY_SP,

detectors/insufficiently-random-values/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/insufficiently-random-values/src/lib.rs

@@ -41,7 +41,7 @@ impl<'tcx> LateLintPass<'tcx> for InsufficientlyRandomValues {
             if path.ident.as_str() == "block_timestamp" ||
             path.ident.as_str() == "block_number";
             then {
-                clippy_utils::diagnostics::span_lint_and_help(
+                clippy_wrappers::span_lint_and_help(
                     cx,
                     INSUFFICIENTLY_RANDOM_VALUES,
                     expr.span,

detectors/integer-overflow-or-underflow/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/integer-overflow-or-underflow/src/lib.rs

@@ -3,12 +3,12 @@
 extern crate rustc_hir;
 extern crate rustc_span;
 
+use clippy_utils::consts::constant_simple;
+use clippy_utils::is_integer_literal;
 use rustc_hir::{self as hir, Body, Expr, ExprKind, UnOp};
 use rustc_lint::LateContext;
 use rustc_lint::LateLintPass;
 use rustc_span::Span;
-use clippy_utils::consts::constant_simple;
-use clippy_utils::is_integer_literal;
 
 pub const LINT_MESSAGE: &str = "Potential for integer arithmetic overflow/underflow. Consider checked, wrapping or saturating arithmetic.";
 
@@ -138,7 +138,7 @@ impl ArithmeticContext {
                     hir::ExprKind::Lit(_lit) => (),
                     hir::ExprKind::Unary(hir::UnOp::Neg, expr) => {
                         if is_integer_literal(expr, 1) {
-                            clippy_utils::diagnostics::span_lint_and_help(
+                            clippy_wrappers::span_lint_and_help(
                                 cx,
                                 INTEGER_OVERFLOW_UNDERFLOW,
                                 expr.span,
@@ -150,7 +150,7 @@ impl ArithmeticContext {
                         }
                     }
                     _ => {
-                        clippy_utils::diagnostics::span_lint_and_help(
+                        clippy_wrappers::span_lint_and_help(
                             cx,
                             INTEGER_OVERFLOW_UNDERFLOW,
                             expr.span,
@@ -162,7 +162,7 @@ impl ArithmeticContext {
                     }
                 },
                 _ => {
-                    clippy_utils::diagnostics::span_lint_and_help(
+                    clippy_wrappers::span_lint_and_help(
                         cx,
                         INTEGER_OVERFLOW_UNDERFLOW,
                         expr.span,
@@ -187,7 +187,7 @@ impl ArithmeticContext {
         }
         let ty = cx.typeck_results().expr_ty(arg);
         if constant_simple(cx, cx.typeck_results(), expr).is_none() && ty.is_integral() {
-            clippy_utils::diagnostics::span_lint_and_help(
+            clippy_wrappers::span_lint_and_help(
                 cx,
                 INTEGER_OVERFLOW_UNDERFLOW,
                 expr.span,

detectors/iterators-over-indexing/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 clippy_utils = { workspace = true }
+clippy_wrappers = { workspace = true }
 if_chain = { workspace = true }
 scout-audit-dylint-linting = { workspace = true }
 

detectors/iterators-over-indexing/src/lib.rs

@@ -118,7 +118,7 @@ impl<'tcx> LateLintPass<'tcx> for IteratorOverIndexing {
             walk_expr(&mut visitor, body.value);
 
             for span in visitor.span_constant {
-                clippy_utils::diagnostics::span_lint_and_help(
+                clippy_wrappers::span_lint_and_help(
                     cx,
                     ITERATOR_OVER_INDEXING,
                     span,