Use reexported annotate_snippets from cairo_lint_core

Author: wawel37

Cargo.lock

@@ -47,7 +47,6 @@ repository = "https://github.com/software-mansion/scarb"
 # To keep our Cargo.toml following this contract, always use `cargo xtask upgrade`
 # for manipulating these dependencies.
 [workspace.dependencies]
-annotate-snippets = "0.11.5"
 anyhow = "1"
 assert_fs = "1"
 async-trait = "0.1"
@@ -194,7 +193,7 @@ cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev
 cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "03944ce36c4b37ef954d7f462d23edce8669e692" }
 cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "03944ce36c4b37ef954d7f462d23edce8669e692" }
 cairo-language-server = { git = "https://github.com/software-mansion/cairols", rev = "6432886fea7564816078ed140434addf50bbaa23" }
-cairo-lint-core = { git = "https://github.com/software-mansion/cairo-lint", rev = "b13c0d1600eb9f0fd9d1d807c695dc0db32a7f65" }
+cairo-lint-core = { git = "https://github.com/software-mansion/cairo-lint", rev = "5a3e8f50db7de8106fcfbaf18ae90526b3647996" }
 
 [profile.release]
 lto = true

Cargo.toml

@@ -14,7 +14,6 @@ readme.workspace = true
 repository.workspace = true
 
 [dependencies]
-annotate-snippets.workspace = true
 anyhow.workspace = true
 async-trait.workspace = true
 cairo-lang-compiler.workspace = true
@@ -105,7 +104,6 @@ reqwest = { workspace = true, default-features = true }
 reqwest = { workspace = true, features = ["rustls-tls-native-roots"] }
 
 [dev-dependencies]
-annotate-snippets = { workspace = true, features = ["testing-colors"] }
 assert_fs.workspace = true
 expect-test.workspace = true
 fs_extra.workspace = true
@@ -119,6 +117,7 @@ similar-asserts.workspace = true
 snapbox.workspace = true
 test-case.workspace = true
 test-for-each-example = { path = "../utils/test-for-each-example" }
+cairo-lint-core = { workspace = true, features = ["testing-colors"]}
 
 [build-dependencies]
 fs_extra.workspace = true

scarb/Cargo.toml

@@ -6,14 +6,14 @@ use crate::{
     core::TargetKind,
     ops,
 };
-use annotate_snippets::Renderer;
 use anyhow::Result;
 use cairo_lang_defs::db::DefsGroup;
 use cairo_lang_diagnostics::Diagnostics;
 use cairo_lang_filesystem::db::FilesGroup;
 use cairo_lang_filesystem::ids::CrateLongId;
 use cairo_lang_semantic::diagnostic::SemanticDiagnosticKind;
 use cairo_lang_semantic::{db::SemanticGroup, SemanticDiagnostic};
+use cairo_lint_core::annotate_snippets::Renderer;
 use cairo_lint_core::{
     apply_fixes,
     diagnostics::format_diagnostic,
@@ -57,7 +57,6 @@ pub fn lint(opts: LintOptions, ws: &Workspace<'_>) -> Result<()> {
         let package_compilation_units = if opts.test {
             compilation_units
                 .iter()
-                // TODO: Test this (if the test packages are also checked)
                 .filter(|compilation_unit| {
                     let is_main_component = compilation_unit.main_package_id() == package.id;
                     let has_test_components =

scarb/src/ops/lint.rs

@@ -20,15 +20,13 @@ fn lint_main_package() {
     "#})
         .build(&t);
 
-    let snapbox = Scarb::quick_snapbox()
+    Scarb::quick_snapbox()
         .arg("lint")
         .current_dir(&t)
         .assert()
-        .success();
-
-    // Current expected values include ANSI color codes because lint has custom renderer.
-    #[cfg(not(windows))]
-        snapbox.stdout_matches(indoc! {r#"
+        .success()
+        // Current expected values include ANSI color codes because lint has custom renderer.
+        .stdout_matches(indoc! {r#"
                Linting hello v1.0.0 ([..]/Scarb.toml)
           warning: Plugin diagnostic: Unnecessary comparison with a boolean value. Use the variable directly.
            --> [..]/lib.cairo:3:8
@@ -79,16 +77,14 @@ fn lint_workspace() {
         "#}))
         .build(&t);
 
-    let snapbox = Scarb::quick_snapbox()
+    Scarb::quick_snapbox()
         .arg("lint")
         .arg("--workspace")
         .current_dir(&t)
         .assert()
-        .success();
-
-    // Current expected values include ANSI color codes because lint has custom renderer.
-    #[cfg(not(windows))]
-      snapbox.stdout_matches(indoc! {r#"
+        .success()
+        // Current expected values include ANSI color codes because lint has custom renderer.
+        .stdout_matches(indoc! {r#"
            Linting first v1.0.0 ([..]/first/Scarb.toml)
       warning: Plugin diagnostic: Unnecessary comparison with a boolean value. Use the variable directly.
        --> [..]/lib.cairo:3:8
@@ -146,16 +142,14 @@ fn lint_integration_tests() {
         "#})
         .unwrap();
 
-    let snapbox = Scarb::quick_snapbox()
+    Scarb::quick_snapbox()
         .arg("lint")
         .arg("-t")
         .current_dir(&t)
         .assert()
-        .success();
-
-    // Current expected values include ANSI color codes because lint has custom renderer.
-    #[cfg(not(windows))]
-        snapbox.stdout_matches(indoc! {r#"
+        .success()
+        // Current expected values include ANSI color codes because lint has custom renderer.
+        .stdout_matches(indoc! {r#"
                Linting hello v1.0.0 ([..]/Scarb.toml)
                Linting test(hello_unittest) hello v1.0.0 ([..]/Scarb.toml)
                Linting test(hello_integrationtest) hello_integrationtest v1.0.0 ([..]/Scarb.toml)