Merge branch 'main' into 61-unprotected-mapping-operation

README.md

@@ -23,15 +23,15 @@ cargo +nightly install cargo-dylint dylint-link
 Afterwards, install Scout with the following command:
 
 ```bash
-cargo +nightly install cargo-scout-audit-soroban
+cargo install cargo-scout-audit
 ```
 
 ### CLI
 
 To run Scout on your project, navigate to its root directory and execute the following command:
 
 ```bash
-cargo scout-audit-soroban
+cargo scout-audit
 ```
 
 ### VSCode Extension

detectors/Cargo.toml

@@ -4,9 +4,9 @@ exclude = [".cargo", "target"]
 resolver = "2"
 
 [workspace.dependencies]
-dylint_linting = "2.1.5"
+dylint_linting = { version = "=2.6.1", package = "scout-audit-dylint-linting"}
 dylint_testing = "2.1.5"
 if_chain = "1.0.2"
 
-scout-audit-clippy-utils = { version = "=0.2.1", path = "../scout-audit-clippy-utils" }
-scout-audit-internal = { path = "../scout-audit-internal", features = ["detector", "lint_helper"] }
+scout-audit-clippy-utils = { version = "=0.2.3" }
+scout-audit-internal = { version="=0.2.4", features = ["detector", "lint_helper"] }

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

@@ -8,7 +8,7 @@ use if_chain::if_chain;
 use rustc_ast::{Expr, ExprKind, Item, NodeId};
 use rustc_lint::{EarlyContext, EarlyLintPass};
 use rustc_span::sym;
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 
 dylint_linting::impl_pre_expansion_lint! {
     /// ### What it does
@@ -43,7 +43,7 @@ dylint_linting::impl_pre_expansion_lint! {
 
     pub AVOID_CORE_MEM_FORGET,
     Warn,
-    Detector::AvoidCoreMemForget.get_lint_message(),
+    "",
     AvoidCoreMemForget::default()
 }
 

detectors/avoid-panic-error/src/lib.rs

@@ -14,7 +14,7 @@ use rustc_ast::{
 use rustc_lint::{EarlyContext, EarlyLintPass};
 use rustc_span::{sym, Span};
 use scout_audit_clippy_utils::sym;
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 
 dylint_linting::impl_pre_expansion_lint! {
     /// ### What it does
@@ -57,7 +57,7 @@ dylint_linting::impl_pre_expansion_lint! {
     /// ```
     pub AVOID_PANIC_ERROR,
     Warn,
-    Detector::AvoidPanicError.get_lint_message(),
+    "",
     AvoidPanicError::default()
 }
 
@@ -182,6 +182,6 @@ fn capitalize_err_msg(s: &str) -> String {
 fn is_test_token_present(token_stream: &TokenStream) -> bool {
     token_stream.trees().any(|tree| match tree {
         TokenTree::Token(token, _) => token.is_ident_named(sym::test),
-        TokenTree::Delimited(_, _, token_stream) => is_test_token_present(token_stream),
+        TokenTree::Delimited(_, _, _, token_stream) => is_test_token_present(token_stream),
     })
 }

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

@@ -10,7 +10,7 @@ use rustc_hir::{
 };
 use rustc_lint::LateLintPass;
 use rustc_span::Span;
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 
 dylint_linting::declare_late_lint! {
     /// ### What it does
@@ -50,7 +50,7 @@ dylint_linting::declare_late_lint! {
     /// ```
     pub AVOID_UNSAFE_BLOCK,
     Warn,
-    Detector::AvoidUnsafeBlock.get_lint_message()
+    ""
 }
 
 impl<'tcx> LateLintPass<'tcx> for AvoidUnsafeBlock {

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

@@ -20,7 +20,7 @@ use rustc_middle::mir::{
 use rustc_middle::ty::TyKind;
 use rustc_span::def_id::DefId;
 use rustc_span::Span;
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 
 dylint_linting::declare_late_lint! {
     /// ### What it does
@@ -45,7 +45,7 @@ dylint_linting::declare_late_lint! {
     /// ```
     pub DIVIDE_BEFORE_MULTIPLY,
     Warn,
-    Detector::DivideBeforeMultiply.get_lint_message()
+    ""
 }
 
 fn get_divisions_inside_expr(expr: &Expr<'_>) -> Vec<Span> {
@@ -298,23 +298,21 @@ fn navigate_trough_basicblocks<'tcx>(
                     spans,
                 );
             }
-            TerminatorKind::InlineAsm { destination, .. } => {
-                if let Option::Some(dest) = destination {
-                    navigate_trough_basicblocks(
-                        *dest,
-                        bbs,
-                        def_ids,
-                        tainted_places,
-                        visited_bbs,
-                        spans,
-                    );
-                }
+            TerminatorKind::InlineAsm {
+                destination: Some(dest),
+                ..
+            } => {
+                navigate_trough_basicblocks(
+                    *dest,
+                    bbs,
+                    def_ids,
+                    tainted_places,
+                    visited_bbs,
+                    spans,
+                );
             }
-            TerminatorKind::GeneratorDrop
-            | TerminatorKind::UnwindResume
-            | TerminatorKind::UnwindTerminate(_)
-            | TerminatorKind::Return
-            | TerminatorKind::Unreachable => {}
+
+            _ => {}
         }
     }
 }

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

@@ -14,7 +14,7 @@ use rustc_hir::{
 };
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_span::{def_id::LocalDefId, Span};
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 
 dylint_linting::declare_late_lint!(
     pub DOS_UNBOUNDED_OPERATION,
@@ -92,13 +92,12 @@ impl<'tcx> Visitor<'tcx> for ForLoopVisitor {
             if let ExprKind::Call(call_func, call_args) = match_expr.kind;
             // Check the function call
             if let ExprKind::Path(qpath) = &call_func.kind;
-            if let QPath::LangItem(LangItem::IntoIterIntoIter, _, _) = qpath;
+            if let QPath::LangItem(LangItem::IntoIterIntoIter, _) = qpath;
             // Check if a Range is used
             if let ExprKind::Struct(struct_lang_item, struct_expr, _) = call_args.first().unwrap().kind;
             if let QPath::LangItem(
                 LangItem::Range | LangItem::RangeInclusiveStruct | LangItem::RangeInclusiveNew,
                 _,
-                _,
             ) = struct_lang_item;
             // Get the start and end of the range
             if let Some(start_expr) = struct_expr.first();

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

@@ -5,7 +5,7 @@ extern crate rustc_hir;
 use if_chain::if_chain;
 use rustc_hir::{BinOpKind, Expr, ExprKind};
 use rustc_lint::{LateContext, LateLintPass};
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 
 dylint_linting::declare_late_lint! {
     /// ### What it does
@@ -21,7 +21,7 @@ dylint_linting::declare_late_lint! {
     ///
     pub INSUFFICIENTLY_RANDOM_VALUES,
     Warn,
-    Detector::InsufficientlyRandomValues.get_lint_message()
+    ""
 }
 
 impl<'tcx> LateLintPass<'tcx> for InsufficientlyRandomValues {

detectors/overflow-check/src/lib.rs

@@ -7,7 +7,7 @@ extern crate rustc_span;
 use std::fs;
 
 use rustc_lint::EarlyLintPass;
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 
 dylint_linting::declare_early_lint! {
     /// ### What it does
@@ -19,7 +19,7 @@ dylint_linting::declare_early_lint! {
     /// wants explicitly checked, wrapping or saturating arithmetic.
     pub OVERFLOW_CHECK,
     Warn,
-    Detector::OverflowCheck.get_lint_message()
+    ""
 }
 
 impl EarlyLintPass for OverflowCheck {

detectors/rust-toolchain

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-09-29"
+channel = "nightly-2023-12-16"
 components = ["llvm-tools-preview", "rustc-dev"]

detectors/set-contract-storage/src/lib.rs

@@ -11,7 +11,7 @@ use rustc_hir::{Body, FnDecl};
 use rustc_hir::{Expr, ExprKind};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_span::Span;
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 
 dylint_linting::declare_late_lint! {
     /// ### What it does
@@ -38,7 +38,7 @@ dylint_linting::declare_late_lint! {
     /// ```
     pub SET_STORAGE_WARN,
     Warn,
-    Detector::SetContractStorage.get_lint_message()
+    ""
 }
 
 impl<'tcx> LateLintPass<'tcx> for SetStorageWarn {

detectors/soroban-version/src/lib.rs

@@ -8,7 +8,7 @@ use std::{io::Error, process::Command};
 
 use rustc_ast::Crate;
 use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 use semver::Version;
 use serde_json::Value;
 
@@ -20,7 +20,7 @@ dylint_linting::declare_early_lint! {
     /// Using an outdated version of soroban could lead to security vulnerabilities, bugs, and other issues.
     pub CHECK_SOROBAN_VERSION,
     Warn,
-    Detector::SorobanVersion.get_lint_message()
+    ""
 }
 
 impl EarlyLintPass for CheckSorobanVersion {

detectors/unprotected-update-current-contract-wasm/src/lib.rs

@@ -17,12 +17,12 @@ use rustc_middle::mir::{BasicBlock, BasicBlocks, Const, Operand, TerminatorKind}
 use rustc_middle::ty::TyKind;
 use rustc_span::def_id::DefId;
 use rustc_span::Span;
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 
 dylint_linting::impl_late_lint! {
     pub UNPROTECTED_UPDATE_CURRENT_CONTRACT_WASM,
     Warn,
-    Detector::UnprotectedUpdateCurrentContractWasm.get_lint_message(),
+    "",
     UnprotectedUpdateCurrentContractWasm::default()
 }
 
@@ -179,22 +179,19 @@ impl<'tcx> LateLintPass<'tcx> for UnprotectedUpdateCurrentContractWasm {
                         visited,
                     ));
                 }
-                TerminatorKind::InlineAsm { destination, .. } => {
-                    if let Some(udestination) = destination {
-                        ret_vec.append(&mut navigate_trough_basicblocks(
-                            bbs,
-                            *udestination,
-                            checked,
-                            uuf_storage,
-                            visited,
-                        ));
-                    }
+                TerminatorKind::InlineAsm {
+                    destination: Some(udestination),
+                    ..
+                } => {
+                    ret_vec.append(&mut navigate_trough_basicblocks(
+                        bbs,
+                        *udestination,
+                        checked,
+                        uuf_storage,
+                        visited,
+                    ));
                 }
-                TerminatorKind::Return
-                | TerminatorKind::Unreachable
-                | TerminatorKind::GeneratorDrop
-                | TerminatorKind::UnwindResume
-                | TerminatorKind::UnwindTerminate(_) => {}
+                _ => {}
             }
             ret_vec
         }

detectors/unsafe-expect/src/lib.rs

@@ -10,7 +10,7 @@ use rustc_hir::{
 };
 use rustc_lint::LateLintPass;
 use rustc_span::{Span, Symbol};
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 
 dylint_linting::declare_late_lint! {
     /// ### What it does
@@ -45,7 +45,7 @@ dylint_linting::declare_late_lint! {
     /// ```
     pub UNSAFE_EXPECT,
     Warn,
-    Detector::UnsafeExpect.get_lint_message()
+    ""
 }
 
 impl<'tcx> LateLintPass<'tcx> for UnsafeExpect {

detectors/unsafe-unwrap/src/lib.rs

@@ -10,7 +10,7 @@ use rustc_hir::{
 };
 use rustc_lint::LateLintPass;
 use rustc_span::{Span, Symbol};
-use scout_audit_internal::Detector;
+use scout_audit_internal::{DetectorImpl, SorobanDetector as Detector};
 
 dylint_linting::declare_late_lint! {
     /// ### What it does
@@ -45,7 +45,7 @@ dylint_linting::declare_late_lint! {
     /// ```
     pub UNSAFE_UNWRAP,
     Warn,
-    Detector::UnsafeUnwrap.get_lint_message()
+    ""
 }
 
 impl<'tcx> LateLintPass<'tcx> for UnsafeUnwrap {