From 51542c39cec6f72f6ae689d27c28536ea73e2fa8 Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Wed, 27 Nov 2024 10:39:04 +0100
Subject: [PATCH 01/23] Make workspace Cargo.toml loadable

---
 Cargo.toml | 77 +++++-------------------------------------------------
 1 file changed, 7 insertions(+), 70 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d76234cd..9d1419f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,7 @@
-[profile.release]
-overflow-checks = true # Enable integer overflow checks.
-
-[profile.release-with-debug]
-inherits = "release"
-debug = true
-
 # The profile used for CI in pull requests.
-# External dependencies are built with optimization enabled, while crates in this workspace are built
-# with `dev` profile and full debug info. This is a trade-off between build time and e2e test time.
+# External dependencies are built with optimisation enabled,
+# while crates in this workspace are built with `dev` profile and full debug info.
+# This is a trade-off between build time and e2e test time.
 [profile.ci-dev]
 inherits = "dev"
 incremental = false
@@ -16,7 +10,6 @@ opt-level = 1
 [profile.ci-dev.package."tokio"]
 opt-level = 3
 [profile.ci-dev.package."bimap"]
-
 opt-level = 3
 [profile.ci-dev.package."rust-analyzer-salsa"]
 opt-level = 3
@@ -24,54 +17,9 @@ opt-level = 3
 [workspace]
 resolver = "2"
 members = [
-    "crates/cairo-lang-casm",
-    "crates/cairo-lang-compiler",
-    "crates/cairo-lang-debug",
-    "crates/cairo-lang-defs",
-    "crates/cairo-lang-diagnostics",
-    "crates/cairo-lang-doc",
-    "crates/cairo-lang-eq-solver",
-    "crates/cairo-lang-filesystem",
-    "crates/cairo-lang-formatter",
     "crates/cairo-lang-language-server",
-    "crates/cairo-lang-lowering",
-    "crates/cairo-lang-parser",
-    "crates/cairo-lang-plugins",
-    "crates/cairo-lang-proc-macros",
-    "crates/cairo-lang-project",
-    "crates/cairo-lang-runnable-utils",
-    "crates/cairo-lang-runnable",
-    "crates/cairo-lang-runner",
-    "crates/cairo-lang-semantic",
-    "crates/cairo-lang-sierra",
-    "crates/cairo-lang-sierra-ap-change",
-    "crates/cairo-lang-sierra-gas",
-    "crates/cairo-lang-sierra-generator",
-    "crates/cairo-lang-sierra-to-casm",
-    "crates/cairo-lang-sierra-type-size",
-    "crates/cairo-lang-starknet",
-    "crates/cairo-lang-starknet-classes",
-    "crates/cairo-lang-syntax",
-    "crates/cairo-lang-syntax-codegen",
-    "crates/cairo-lang-test-plugin",
-    "crates/cairo-lang-test-runner",
-    "crates/cairo-lang-utils",
-    "crates/bin/cairo-compile",
-    "crates/bin/cairo-format",
     "crates/bin/cairo-language-server",
-    "crates/bin/cairo-prove",
-    "crates/bin/cairo-run",
-    "crates/bin/cairo-test",
-    "crates/bin/generate-syntax",
-    "crates/bin/sierra-compile",
-    "crates/bin/starknet-compile",
-    "crates/bin/starknet-sierra-compile",
-    "crates/bin/starknet-sierra-extract-code",
-    "crates/bin/get-lowering",
-    "crates/bin/starknet-sierra-upgrade-validate",
-    "tests",
 ]
-exclude = ["ensure-no_std"]
 
 [workspace.package]
 version = "2.8.5"
@@ -88,7 +36,7 @@ ark-secp256r1 = "0.4.0"
 ark-std = "0.4.0"
 assert_matches = "1.5"
 bimap = "0.6.3"
-cairo-vm = { version = "1.0.1", features = ["mod_builtin"]}
+cairo-vm = { version = "1.0.1", features = ["mod_builtin"] }
 clap = { version = "4.5.4", features = ["derive"] }
 colored = "2.1.0"
 const-fnv1a-hash = "1.1.0"
@@ -112,9 +60,7 @@ log = "0.4.21"
 num-bigint = { version = "0.4.5", default-features = false }
 num-integer = "0.1.46"
 num-traits = { version = "0.2.19", default-features = false }
-parity-scale-codec = { version = "3.6.9", default-features = false, features = [
-    "derive",
-] }
+parity-scale-codec = { version = "3.6.9", default-features = false, features = ["derive"] }
 path-clean = "1.0.1"
 pretty_assertions = "1.4.0"
 proc-macro2 = "1.0.82"
@@ -130,24 +76,15 @@ serde_json = "1.0.116"
 sha2 = "0.10.8"
 sha3 = "0.10.8"
 smol_str = { version = "0.2.0", features = ["serde"] }
-starknet-types-core = { version = "0.1.0", features = [
-    "hash",
-    "prime-bigint",
-    "serde",
-] }
+starknet-types-core = { version = "0.1.0", features = ["hash", "prime-bigint", "serde"] }
 syn = { version = "2.0.61", features = ["full", "extra-traits"] }
 test-case = "3.3.1"
 test-case-macros = "3.3.1"
 test-log = "0.2.16"
 thiserror = "1.0.60"
-time = { version = "0.3.36", features = [
-    "formatting",
-    "macros",
-    "local-offset",
-] }
+time = { version = "0.3.36", features = ["formatting", "macros", "local-offset"] }
 tokio = { version = "1.37.0", features = ["full", "sync"] }
 toml = "0.8.12"
 unescaper = "0.1.2"
 xshell = "0.2.6"
-
 openssl = { version = "0.10.35" }

From b2612fedb0f78881a005f568ea26be8a4926a90e Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Wed, 27 Nov 2024 10:39:25 +0100
Subject: [PATCH 02/23] Rename profile `ci-dev` to `ci`

---
 .github/workflows/ci.yml | 72 ++++++++++++++++++++--------------------
 Cargo.toml               | 10 +++---
 scripts/cairo_fmt.sh     |  2 +-
 scripts/cairo_test.sh    |  4 +--
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1327dde7..930f6c8e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,42 +25,42 @@ jobs:
     strategy:
       matrix:
         cmd:
-          - test --profile=ci-dev -p cairo-lang-casm --features=serde,parity-scale-codec,schemars
-          - test --profile=ci-dev -p cairo-lang-casm --no-default-features --features=serde,parity-scale-codec
-          - test --profile=ci-dev -p cairo-lang-compiler
-          - test --profile=ci-dev -p cairo-lang-debug
-          - test --profile=ci-dev -p cairo-lang-defs
-          - test --profile=ci-dev -p cairo-lang-diagnostics
-          - test --profile=ci-dev -p cairo-lang-doc
-          - test --profile=ci-dev -p cairo-lang-eq-solver
-          - test --profile=ci-dev -p cairo-lang-filesystem
-          - test --profile=ci-dev -p cairo-lang-formatter
-          - test --profile=ci-dev -p cairo-lang-language-server
-          - test --profile=ci-dev -p cairo-lang-lowering
-          - test --profile=ci-dev -p cairo-lang-parser
-          - test --profile=ci-dev -p cairo-lang-plugins
-          - test --profile=ci-dev -p cairo-lang-proc-macros
-          - test --profile=ci-dev -p cairo-lang-project
-          - test --profile=ci-dev -p cairo-lang-runnable
-          - test --profile=ci-dev -p cairo-lang-runnable-utils
-          - test --profile=ci-dev -p cairo-lang-runner
-          - test --profile=ci-dev -p cairo-lang-semantic
-          - test --profile=ci-dev -p cairo-lang-sierra
-          - test --profile=ci-dev -p cairo-lang-sierra-ap-change
-          - test --profile=ci-dev -p cairo-lang-sierra-gas
-          - test --profile=ci-dev -p cairo-lang-sierra-generator
-          - test --profile=ci-dev -p cairo-lang-sierra-to-casm
-          - test --profile=ci-dev -p cairo-lang-sierra-type-size
-          - test --profile=ci-dev -p cairo-lang-starknet-classes
-          - test --profile=ci-dev -p cairo-lang-starknet
-          - test --profile=ci-dev -p cairo-lang-syntax
-          - test --profile=ci-dev -p cairo-lang-syntax-codegen
-          - test --profile=ci-dev -p cairo-lang-test-plugin
-          - test --profile=ci-dev -p cairo-lang-test-runner
-          - test --profile=ci-dev -p cairo-lang-test-utils
-          - test --profile=ci-dev -p cairo-lang-utils --features=serde,parity-scale-codec,schemars,testing,env_logger
-          - test --profile=ci-dev -p cairo-lang-utils --no-default-features --features=serde,parity-scale-codec
-          - test --profile=ci-dev -p tests
+          - test --profile=ci -p cairo-lang-casm --features=serde,parity-scale-codec,schemars
+          - test --profile=ci -p cairo-lang-casm --no-default-features --features=serde,parity-scale-codec
+          - test --profile=ci -p cairo-lang-compiler
+          - test --profile=ci -p cairo-lang-debug
+          - test --profile=ci -p cairo-lang-defs
+          - test --profile=ci -p cairo-lang-diagnostics
+          - test --profile=ci -p cairo-lang-doc
+          - test --profile=ci -p cairo-lang-eq-solver
+          - test --profile=ci -p cairo-lang-filesystem
+          - test --profile=ci -p cairo-lang-formatter
+          - test --profile=ci -p cairo-lang-language-server
+          - test --profile=ci -p cairo-lang-lowering
+          - test --profile=ci -p cairo-lang-parser
+          - test --profile=ci -p cairo-lang-plugins
+          - test --profile=ci -p cairo-lang-proc-macros
+          - test --profile=ci -p cairo-lang-project
+          - test --profile=ci -p cairo-lang-runnable
+          - test --profile=ci -p cairo-lang-runnable-utils
+          - test --profile=ci -p cairo-lang-runner
+          - test --profile=ci -p cairo-lang-semantic
+          - test --profile=ci -p cairo-lang-sierra
+          - test --profile=ci -p cairo-lang-sierra-ap-change
+          - test --profile=ci -p cairo-lang-sierra-gas
+          - test --profile=ci -p cairo-lang-sierra-generator
+          - test --profile=ci -p cairo-lang-sierra-to-casm
+          - test --profile=ci -p cairo-lang-sierra-type-size
+          - test --profile=ci -p cairo-lang-starknet-classes
+          - test --profile=ci -p cairo-lang-starknet
+          - test --profile=ci -p cairo-lang-syntax
+          - test --profile=ci -p cairo-lang-syntax-codegen
+          - test --profile=ci -p cairo-lang-test-plugin
+          - test --profile=ci -p cairo-lang-test-runner
+          - test --profile=ci -p cairo-lang-test-utils
+          - test --profile=ci -p cairo-lang-utils --features=serde,parity-scale-codec,schemars,testing,env_logger
+          - test --profile=ci -p cairo-lang-utils --no-default-features --features=serde,parity-scale-codec
+          - test --profile=ci -p tests
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
diff --git a/Cargo.toml b/Cargo.toml
index 9d1419f8..6c7d971e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,16 +2,16 @@
 # External dependencies are built with optimisation enabled,
 # while crates in this workspace are built with `dev` profile and full debug info.
 # This is a trade-off between build time and e2e test time.
-[profile.ci-dev]
+[profile.ci]
 inherits = "dev"
 incremental = false
-[profile.ci-dev.package."*"] # external dependencies
+[profile.ci.package."*"] # external dependencies
 opt-level = 1
-[profile.ci-dev.package."tokio"]
+[profile.ci.package."tokio"]
 opt-level = 3
-[profile.ci-dev.package."bimap"]
+[profile.ci.package."bimap"]
 opt-level = 3
-[profile.ci-dev.package."rust-analyzer-salsa"]
+[profile.ci.package."rust-analyzer-salsa"]
 opt-level = 3
 
 [workspace]
diff --git a/scripts/cairo_fmt.sh b/scripts/cairo_fmt.sh
index f85393e3..0be5792c 100755
--- a/scripts/cairo_fmt.sh
+++ b/scripts/cairo_fmt.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cargo run --profile=ci-dev --bin cairo-format -- --recursive "$@"
+cargo run --profile=ci --bin cairo-format -- --recursive "$@"
diff --git a/scripts/cairo_test.sh b/scripts/cairo_test.sh
index e6be05d0..9688457c 100755
--- a/scripts/cairo_test.sh
+++ b/scripts/cairo_test.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-cargo run --profile=ci-dev --bin cairo-test -- corelib/ &&
-    cargo run --profile=ci-dev --bin cairo-test -- tests/bug_samples/ --starknet
+cargo run --profile=ci --bin cairo-test -- corelib/ &&
+    cargo run --profile=ci --bin cairo-test -- tests/bug_samples/ --starknet

From e0a2acabea0fc552244f660b8036836f69cc767a Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Wed, 27 Nov 2024 10:43:24 +0100
Subject: [PATCH 03/23] Fix `cairo-lang-*` crates dependencies

---
 Cargo.lock                                   | 2271 +-----------------
 crates/cairo-lang-language-server/Cargo.toml |   32 +-
 2 files changed, 113 insertions(+), 2190 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 62103aa9..6e16b1f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,32 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aes"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.11"
@@ -110,134 +84,6 @@ version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
-[[package]]
-name = "ark-ec"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
-dependencies = [
- "ark-ff",
- "ark-poly",
- "ark-serialize",
- "ark-std",
- "derivative",
- "hashbrown 0.13.2",
- "itertools 0.10.5",
- "num-traits 0.2.19",
- "zeroize",
-]
-
-[[package]]
-name = "ark-ff"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba"
-dependencies = [
- "ark-ff-asm",
- "ark-ff-macros",
- "ark-serialize",
- "ark-std",
- "derivative",
- "digest",
- "itertools 0.10.5",
- "num-bigint",
- "num-traits 0.2.19",
- "paste",
- "rustc_version",
- "zeroize",
-]
-
-[[package]]
-name = "ark-ff-asm"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "ark-ff-macros"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
-dependencies = [
- "num-bigint",
- "num-traits 0.2.19",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "ark-poly"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
-dependencies = [
- "ark-ff",
- "ark-serialize",
- "ark-std",
- "derivative",
- "hashbrown 0.13.2",
-]
-
-[[package]]
-name = "ark-secp256k1"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c02e954eaeb4ddb29613fee20840c2bbc85ca4396d53e33837e11905363c5f2"
-dependencies = [
- "ark-ec",
- "ark-ff",
- "ark-std",
-]
-
-[[package]]
-name = "ark-secp256r1"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3975a01b0a6e3eae0f72ec7ca8598a6620fc72fa5981f6f5cca33b7cd788f633"
-dependencies = [
- "ark-ec",
- "ark-ff",
- "ark-std",
-]
-
-[[package]]
-name = "ark-serialize"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
-dependencies = [
- "ark-serialize-derive",
- "ark-std",
- "digest",
- "num-bigint",
-]
-
-[[package]]
-name = "ark-serialize-derive"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "ark-std"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
-dependencies = [
- "num-traits 0.2.19",
- "rand",
-]
-
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -274,82 +120,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
-[[package]]
-name = "async-channel"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-dependencies = [
- "concurrent-queue",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
 [[package]]
 name = "autocfg"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
-[[package]]
-name = "backtrace"
-version = "0.3.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "base64ct"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-
-[[package]]
-name = "bimap"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
-
-[[package]]
-name = "bincode"
-version = "2.0.0-rc.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95"
-dependencies = [
- "bincode_derive",
- "serde",
-]
-
-[[package]]
-name = "bincode_derive"
-version = "2.0.0-rc.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e30759b3b99a1b802a7a3aa21c85c3ded5c28e1c83170d82d70f08bbf7f3e4c"
-dependencies = [
- "virtue",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -420,84 +196,23 @@ version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
-
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.11+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "cairo-compile"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "cairo-lang-compiler",
- "cairo-lang-lowering",
- "cairo-lang-utils",
- "clap",
- "log",
-]
-
-[[package]]
-name = "cairo-format"
-version = "2.8.5"
-dependencies = [
- "cairo-lang-formatter",
- "cairo-lang-utils",
- "clap",
- "colored",
- "ignore",
- "log",
-]
-
 [[package]]
 name = "cairo-lang-casm"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-utils",
- "env_logger",
  "indoc",
- "itertools 0.12.1",
  "num-bigint",
  "num-traits 0.2.19",
  "parity-scale-codec",
- "pretty_assertions",
- "schemars",
  "serde",
- "test-case",
- "test-log",
 ]
 
 [[package]]
 name = "cairo-lang-compiler"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "anyhow",
  "cairo-lang-defs",
@@ -522,53 +237,43 @@ dependencies = [
 [[package]]
 name = "cairo-lang-debug"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
- "cairo-lang-proc-macros",
  "cairo-lang-utils",
- "env_logger",
- "rust-analyzer-salsa",
- "test-log",
 ]
 
 [[package]]
 name = "cairo-lang-defs"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
  "cairo-lang-parser",
  "cairo-lang-syntax",
- "cairo-lang-test-utils",
  "cairo-lang-utils",
- "env_logger",
- "indoc",
  "itertools 0.12.1",
- "pretty_assertions",
  "rust-analyzer-salsa",
  "smol_str",
- "test-log",
 ]
 
 [[package]]
 name = "cairo-lang-diagnostics"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
  "cairo-lang-utils",
- "env_logger",
- "indoc",
  "itertools 0.12.1",
- "pretty_assertions",
- "test-log",
 ]
 
 [[package]]
 name = "cairo-lang-doc"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
- "anyhow",
  "cairo-lang-debug",
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
@@ -577,46 +282,41 @@ dependencies = [
  "cairo-lang-parser",
  "cairo-lang-semantic",
  "cairo-lang-syntax",
- "cairo-lang-test-utils",
  "cairo-lang-utils",
- "indoc",
  "itertools 0.12.1",
  "pulldown-cmark",
  "rust-analyzer-salsa",
  "smol_str",
- "test-log",
 ]
 
 [[package]]
 name = "cairo-lang-eq-solver"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-utils",
- "env_logger",
  "good_lp",
- "test-log",
 ]
 
 [[package]]
 name = "cairo-lang-filesystem"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-utils",
- "env_logger",
  "path-clean",
  "rust-analyzer-salsa",
  "semver",
  "serde",
- "serde_json",
  "smol_str",
- "test-log",
  "toml",
 ]
 
 [[package]]
 name = "cairo-lang-formatter"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "anyhow",
  "cairo-lang-diagnostics",
@@ -627,10 +327,8 @@ dependencies = [
  "diffy",
  "ignore",
  "itertools 0.12.1",
- "pretty_assertions",
  "rust-analyzer-salsa",
  "serde",
- "test-case",
  "thiserror",
 ]
 
@@ -687,30 +385,25 @@ dependencies = [
 [[package]]
 name = "cairo-lang-lowering"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
  "cairo-lang-parser",
- "cairo-lang-plugins",
  "cairo-lang-proc-macros",
  "cairo-lang-semantic",
  "cairo-lang-syntax",
- "cairo-lang-test-utils",
  "cairo-lang-utils",
- "env_logger",
  "id-arena",
- "indoc",
  "itertools 0.12.1",
  "log",
  "num-bigint",
  "num-integer",
  "num-traits 0.2.19",
- "pretty_assertions",
  "rust-analyzer-salsa",
  "smol_str",
- "test-log",
 ]
 
 [[package]]
@@ -745,51 +438,44 @@ checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf"
 [[package]]
 name = "cairo-lang-parser"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
  "cairo-lang-syntax",
  "cairo-lang-syntax-codegen",
- "cairo-lang-test-utils",
  "cairo-lang-utils",
  "colored",
- "env_logger",
- "indoc",
  "itertools 0.12.1",
  "num-bigint",
  "num-traits 0.2.19",
- "pretty_assertions",
  "rust-analyzer-salsa",
  "smol_str",
- "test-log",
  "unescaper",
 ]
 
 [[package]]
 name = "cairo-lang-plugins"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
- "cairo-lang-debug",
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
  "cairo-lang-parser",
  "cairo-lang-syntax",
- "cairo-lang-test-utils",
  "cairo-lang-utils",
- "env_logger",
  "indent",
  "indoc",
  "itertools 0.12.1",
  "rust-analyzer-salsa",
- "serde_json",
  "smol_str",
- "test-log",
 ]
 
 [[package]]
 name = "cairo-lang-proc-macros"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-debug",
  "quote",
@@ -799,143 +485,56 @@ dependencies = [
 [[package]]
 name = "cairo-lang-project"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-utils",
- "indoc",
- "pretty_assertions",
  "serde",
  "thiserror",
  "toml",
 ]
 
 [[package]]
-name = "cairo-lang-runnable"
+name = "cairo-lang-semantic"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
- "anyhow",
- "cairo-lang-casm",
- "cairo-lang-compiler",
  "cairo-lang-debug",
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
- "cairo-lang-lowering",
+ "cairo-lang-parser",
  "cairo-lang-plugins",
- "cairo-lang-runnable-utils",
- "cairo-lang-semantic",
- "cairo-lang-sierra-generator",
- "cairo-lang-sierra-to-casm",
+ "cairo-lang-proc-macros",
  "cairo-lang-syntax",
  "cairo-lang-test-utils",
  "cairo-lang-utils",
- "cairo-vm",
- "env_logger",
+ "id-arena",
  "indoc",
  "itertools 0.12.1",
- "serde",
- "test-case",
- "test-log",
+ "num-bigint",
+ "num-traits 0.2.19",
+ "rust-analyzer-salsa",
+ "smol_str",
+ "toml",
 ]
 
 [[package]]
-name = "cairo-lang-runnable-utils"
+name = "cairo-lang-sierra"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
- "cairo-lang-casm",
- "cairo-lang-sierra",
- "cairo-lang-sierra-ap-change",
- "cairo-lang-sierra-gas",
- "cairo-lang-sierra-to-casm",
- "cairo-lang-sierra-type-size",
- "cairo-lang-utils",
- "cairo-vm",
- "thiserror",
-]
-
-[[package]]
-name = "cairo-lang-runner"
-version = "2.8.5"
-dependencies = [
- "ark-ff",
- "ark-secp256k1",
- "ark-secp256r1",
- "cairo-lang-casm",
- "cairo-lang-compiler",
- "cairo-lang-lowering",
- "cairo-lang-runnable-utils",
- "cairo-lang-semantic",
- "cairo-lang-sierra",
- "cairo-lang-sierra-generator",
- "cairo-lang-sierra-to-casm",
- "cairo-lang-starknet",
- "cairo-lang-test-utils",
- "cairo-lang-utils",
- "cairo-vm",
- "env_logger",
- "indoc",
- "itertools 0.12.1",
- "keccak",
- "num-bigint",
- "num-integer",
- "num-traits 0.2.19",
- "rand",
- "sha2",
- "smol_str",
- "starknet-types-core",
- "test-case",
- "test-log",
- "thiserror",
-]
-
-[[package]]
-name = "cairo-lang-semantic"
-version = "2.8.5"
-dependencies = [
- "cairo-lang-debug",
- "cairo-lang-defs",
- "cairo-lang-diagnostics",
- "cairo-lang-filesystem",
- "cairo-lang-parser",
- "cairo-lang-plugins",
- "cairo-lang-proc-macros",
- "cairo-lang-syntax",
- "cairo-lang-test-utils",
- "cairo-lang-utils",
- "env_logger",
- "id-arena",
- "indoc",
- "itertools 0.12.1",
- "log",
- "num-bigint",
- "num-traits 0.2.19",
- "pretty_assertions",
- "rust-analyzer-salsa",
- "smol_str",
- "test-log",
- "toml",
-]
-
-[[package]]
-name = "cairo-lang-sierra"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "bimap",
- "cairo-lang-test-utils",
+ "anyhow",
  "cairo-lang-utils",
  "const-fnv1a-hash",
  "convert_case",
  "derivative",
- "env_logger",
- "indoc",
  "itertools 0.12.1",
  "lalrpop",
  "lalrpop-util",
  "num-bigint",
  "num-integer",
  "num-traits 0.2.19",
- "pretty_assertions",
  "regex",
  "rust-analyzer-salsa",
  "serde",
@@ -943,20 +542,18 @@ dependencies = [
  "sha3",
  "smol_str",
  "starknet-types-core",
- "test-case",
- "test-log",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-sierra-ap-change"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
  "cairo-lang-sierra-type-size",
  "cairo-lang-utils",
- "env_logger",
  "itertools 0.12.1",
  "num-bigint",
  "num-traits 0.2.19",
@@ -966,26 +563,22 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-gas"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
  "cairo-lang-sierra-type-size",
- "cairo-lang-test-utils",
  "cairo-lang-utils",
- "env_logger",
- "indoc",
  "itertools 0.12.1",
  "num-bigint",
  "num-traits 0.2.19",
- "pretty_assertions",
- "test-case",
- "test-log",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-sierra-generator"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -993,29 +586,22 @@ dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-lowering",
  "cairo-lang-parser",
- "cairo-lang-plugins",
  "cairo-lang-semantic",
  "cairo-lang-sierra",
  "cairo-lang-syntax",
- "cairo-lang-test-utils",
  "cairo-lang-utils",
- "env_logger",
- "indoc",
  "itertools 0.12.1",
- "log",
  "num-traits 0.2.19",
- "pretty_assertions",
  "rust-analyzer-salsa",
  "serde",
  "serde_json",
  "smol_str",
- "test-case",
- "test-log",
 ]
 
 [[package]]
 name = "cairo-lang-sierra-to-casm"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "assert_matches",
  "cairo-lang-casm",
@@ -1023,23 +609,19 @@ dependencies = [
  "cairo-lang-sierra-ap-change",
  "cairo-lang-sierra-gas",
  "cairo-lang-sierra-type-size",
- "cairo-lang-test-utils",
  "cairo-lang-utils",
- "env_logger",
  "indoc",
  "itertools 0.12.1",
  "num-bigint",
  "num-traits 0.2.19",
- "pretty_assertions",
  "starknet-types-core",
- "test-case",
- "test-log",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-sierra-type-size"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-sierra",
  "cairo-lang-utils",
@@ -1048,10 +630,10 @@ dependencies = [
 [[package]]
 name = "cairo-lang-starknet"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
- "cairo-lang-debug",
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
@@ -1062,81 +644,68 @@ dependencies = [
  "cairo-lang-sierra-generator",
  "cairo-lang-starknet-classes",
  "cairo-lang-syntax",
- "cairo-lang-test-utils",
  "cairo-lang-utils",
  "const_format",
- "env_logger",
  "indent",
  "indoc",
  "itertools 0.12.1",
- "pretty_assertions",
  "serde",
  "serde_json",
  "smol_str",
  "starknet-types-core",
- "test-case",
- "test-log",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-starknet-classes"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-casm",
  "cairo-lang-sierra",
- "cairo-lang-sierra-generator",
  "cairo-lang-sierra-to-casm",
- "cairo-lang-test-utils",
  "cairo-lang-utils",
  "convert_case",
- "env_logger",
- "indoc",
  "itertools 0.12.1",
  "num-bigint",
  "num-integer",
  "num-traits 0.2.19",
- "pretty_assertions",
  "serde",
  "serde_json",
  "sha3",
  "smol_str",
  "starknet-types-core",
- "test-case",
- "test-log",
  "thiserror",
 ]
 
 [[package]]
 name = "cairo-lang-syntax"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
  "cairo-lang-utils",
- "env_logger",
  "num-bigint",
  "num-traits 0.2.19",
- "pretty_assertions",
  "rust-analyzer-salsa",
  "smol_str",
- "test-log",
  "unescaper",
 ]
 
 [[package]]
 name = "cairo-lang-syntax-codegen"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
- "env_logger",
  "genco",
- "test-log",
  "xshell",
 ]
 
 [[package]]
 name = "cairo-lang-test-plugin"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -1159,59 +728,30 @@ dependencies = [
  "starknet-types-core",
 ]
 
-[[package]]
-name = "cairo-lang-test-runner"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "cairo-lang-compiler",
- "cairo-lang-filesystem",
- "cairo-lang-runner",
- "cairo-lang-sierra",
- "cairo-lang-sierra-generator",
- "cairo-lang-sierra-to-casm",
- "cairo-lang-starknet",
- "cairo-lang-test-plugin",
- "cairo-lang-utils",
- "colored",
- "itertools 0.12.1",
- "num-traits 0.2.19",
- "rayon",
- "serde_json",
- "starknet-types-core",
-]
-
 [[package]]
 name = "cairo-lang-test-utils"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "cairo-lang-formatter",
  "cairo-lang-utils",
  "colored",
- "env_logger",
  "log",
  "pretty_assertions",
- "test-log",
 ]
 
 [[package]]
 name = "cairo-lang-utils"
 version = "2.8.5"
+source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
- "env_logger",
  "hashbrown 0.14.5",
  "indexmap 2.3.0",
  "itertools 0.12.1",
- "log",
  "num-bigint",
  "num-traits 0.2.19",
- "parity-scale-codec",
  "schemars",
  "serde",
- "serde_json",
- "test-case",
- "test-log",
- "time",
 ]
 
 [[package]]
@@ -1221,78 +761,6 @@ dependencies = [
  "cairo-lang-language-server",
 ]
 
-[[package]]
-name = "cairo-prove"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "bincode",
- "cairo-lang-compiler",
- "cairo-lang-runnable",
- "cairo-lang-runner",
- "cairo-vm",
- "clap",
- "num-bigint",
- "serde_json",
-]
-
-[[package]]
-name = "cairo-run"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "cairo-lang-compiler",
- "cairo-lang-diagnostics",
- "cairo-lang-runner",
- "cairo-lang-sierra-generator",
- "cairo-lang-starknet",
- "cairo-lang-utils",
- "clap",
-]
-
-[[package]]
-name = "cairo-test"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "cairo-lang-compiler",
- "cairo-lang-test-runner",
- "clap",
- "serde",
-]
-
-[[package]]
-name = "cairo-vm"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58363ad8065ed891e3b14a8191b707677c7c7cb5b9d10030822506786d8d8108"
-dependencies = [
- "anyhow",
- "bincode",
- "bitvec",
- "clap",
- "generic-array",
- "hashbrown 0.14.5",
- "hex",
- "keccak",
- "lazy_static",
- "nom",
- "num-bigint",
- "num-integer",
- "num-prime",
- "num-traits 0.2.19",
- "rand",
- "rust_decimal",
- "serde",
- "serde_json",
- "sha2",
- "sha3",
- "starknet-crypto",
- "starknet-types-core",
- "thiserror-no-std",
- "zip",
-]
-
 [[package]]
 name = "camino"
 version = "1.1.7"
@@ -1302,72 +770,12 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "cc"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
-dependencies = [
- "jobserver",
- "libc",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
-
 [[package]]
 name = "colorchoice"
 version = "1.0.2"
@@ -1384,28 +792,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "concurrent-queue"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "unicode-width",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "const-fnv1a-hash"
 version = "1.1.0"
@@ -1432,12 +818,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
 [[package]]
 name = "convert_case"
 version = "0.6.0"
@@ -1447,22 +827,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
@@ -1472,15 +836,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "crossbeam"
 version = "0.8.4"
@@ -1543,17 +898,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
-[[package]]
-name = "crypto-bigint"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
-dependencies = [
- "generic-array",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -1570,15 +914,6 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
-]
-
 [[package]]
 name = "derivative"
 version = "2.2.0"
@@ -1619,7 +954,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
- "subtle",
 ]
 
 [[package]]
@@ -1670,21 +1004,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "env_filter"
 version = "0.1.2"
@@ -1692,7 +1011,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
 dependencies = [
  "log",
- "regex",
 ]
 
 [[package]]
@@ -1704,7 +1022,6 @@ dependencies = [
  "anstream",
  "anstyle",
  "env_filter",
- "humantime",
  "log",
 ]
 
@@ -1724,27 +1041,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "event-listener"
-version = "5.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
-dependencies = [
- "event-listener",
- "pin-project-lite",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.1.0"
@@ -1757,37 +1053,12 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
-[[package]]
-name = "flate2"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -1803,65 +1074,12 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
-[[package]]
-name = "futures"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
 [[package]]
 name = "futures-core"
 version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
 [[package]]
 name = "futures-sink"
 version = "0.3.31"
@@ -1886,13 +1104,9 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
- "futures-channel",
  "futures-core",
- "futures-io",
- "futures-macro",
  "futures-sink",
  "futures-task",
- "memchr",
  "pin-project-lite",
  "pin-utils",
  "slab",
@@ -1920,15 +1134,6 @@ dependencies = [
  "syn 2.0.72",
 ]
 
-[[package]]
-name = "generate-syntax"
-version = "2.8.5"
-dependencies = [
- "cairo-lang-syntax-codegen",
- "cairo-lang-utils",
- "log",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.7"
@@ -1939,24 +1144,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "get-lowering"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "cairo-lang-compiler",
- "cairo-lang-debug",
- "cairo-lang-defs",
- "cairo-lang-filesystem",
- "cairo-lang-lowering",
- "cairo-lang-semantic",
- "cairo-lang-starknet",
- "cairo-lang-utils",
- "clap",
- "convert_case",
- "itertools 0.12.1",
-]
-
 [[package]]
 name = "getopts"
 version = "0.2.21"
@@ -1973,24 +1160,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi",
- "wasm-bindgen",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
 [[package]]
 name = "globset"
 version = "0.4.14"
@@ -2001,245 +1174,71 @@ dependencies = [
  "bstr",
  "log",
  "regex-automata 0.4.8",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "globwalk"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
-dependencies = [
- "bitflags 2.6.0",
- "ignore",
- "walkdir",
-]
-
-[[package]]
-name = "good_lp"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3198bd13dea84c76a64621d6ee8ee26a4960a9a0d538eca95ca8f1320a469ac9"
-dependencies = [
- "fnv",
- "minilp",
-]
-
-[[package]]
-name = "governor"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0746aa765db78b521451ef74221663b57ba595bf83f75d0ce23cc09447c8139f"
-dependencies = [
- "cfg-if",
- "futures-sink",
- "futures-timer",
- "futures-util",
- "no-std-compat",
- "nonzero_ext",
- "parking_lot",
- "portable-atomic",
- "quanta",
- "smallvec",
- "spinning_top",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap 2.3.0",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
- "allocator-api2",
- "serde",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
-name = "http-body"
-version = "1.0.1"
+name = "globwalk"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
 dependencies = [
- "bytes",
- "http",
+ "bitflags 2.6.0",
+ "ignore",
+ "walkdir",
 ]
 
 [[package]]
-name = "http-body-util"
-version = "0.1.2"
+name = "good_lp"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "3198bd13dea84c76a64621d6ee8ee26a4960a9a0d538eca95ca8f1320a469ac9"
 dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "pin-project-lite",
+ "fnv",
+ "minilp",
 ]
 
 [[package]]
-name = "httparse"
-version = "1.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "1.4.1"
+name = "governor"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "0746aa765db78b521451ef74221663b57ba595bf83f75d0ce23cc09447c8139f"
 dependencies = [
- "bytes",
- "futures-channel",
+ "cfg-if",
+ "futures-sink",
+ "futures-timer",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "itoa",
- "pin-project-lite",
+ "no-std-compat",
+ "nonzero_ext",
+ "parking_lot",
+ "portable-atomic",
+ "quanta",
  "smallvec",
- "tokio",
- "want",
+ "spinning_top",
 ]
 
 [[package]]
-name = "hyper-rustls"
-version = "0.27.2"
+name = "hashbrown"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "hyper-util",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
-]
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
-name = "hyper-tls"
-version = "0.6.0"
+name = "hashbrown"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "bytes",
- "http-body-util",
- "hyper",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
+ "ahash",
+ "allocator-api2",
+ "serde",
 ]
 
 [[package]]
-name = "hyper-util"
-version = "0.1.7"
+name = "heck"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower",
- "tower-service",
- "tracing",
-]
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "id-arena"
@@ -2312,64 +1311,18 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "indicatif"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
-dependencies = [
- "console",
- "instant",
- "number_prefix",
- "portable-atomic",
- "unicode-width",
-]
-
 [[package]]
 name = "indoc"
 version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.11.0"
@@ -2394,15 +1347,6 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
-[[package]]
-name = "jobserver"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "jod-thread"
 version = "0.1.2"
@@ -2485,9 +1429,6 @@ name = "lazy_static"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-dependencies = [
- "spin",
-]
 
 [[package]]
 name = "libc"
@@ -2547,15 +1488,6 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
-[[package]]
-name = "lru"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
-dependencies = [
- "hashbrown 0.14.5",
-]
-
 [[package]]
 name = "lsp-server"
 version = "0.7.7"
@@ -2605,12 +1537,6 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
 [[package]]
 name = "minilp"
 version = "0.2.2"
@@ -2621,50 +1547,6 @@ dependencies = [
  "sprs",
 ]
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
-dependencies = [
- "hermit-abi",
- "libc",
- "wasi",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "ndarray"
 version = "0.13.1"
@@ -2690,16 +1572,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
 
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
 [[package]]
 name = "nonzero_ext"
 version = "0.3.0"
@@ -2724,7 +1596,6 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits 0.2.19",
- "rand",
  "serde",
 ]
 
@@ -2738,12 +1609,6 @@ dependencies = [
  "num-traits 0.2.19",
 ]
 
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -2753,33 +1618,6 @@ dependencies = [
  "num-traits 0.2.19",
 ]
 
-[[package]]
-name = "num-modular"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits 0.2.19",
-]
-
-[[package]]
-name = "num-prime"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e238432a7881ec7164503ccc516c014bf009be7984cde1ba56837862543bdec3"
-dependencies = [
- "bitvec",
- "either",
- "lru",
- "num-bigint",
- "num-integer",
- "num-modular",
- "num-traits 0.2.19",
- "rand",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.1.43"
@@ -2798,30 +1636,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "num_threads"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
-[[package]]
-name = "object"
-version = "0.36.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -2834,60 +1648,6 @@ version = "11.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
 
-[[package]]
-name = "openssl"
-version = "0.10.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-src"
-version = "300.3.1+3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.103"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
-dependencies = [
- "cc",
- "libc",
- "openssl-src",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -2920,12 +1680,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -2949,23 +1703,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
 [[package]]
 name = "path-clean"
 version = "1.0.1"
@@ -2978,18 +1715,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
-[[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest",
- "hmac",
- "password-hash",
- "sha2",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -3012,35 +1737,15 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
 dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pico-args"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
-
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
+ "siphasher",
 ]
 
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.14"
@@ -3053,33 +1758,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
 [[package]]
 name = "portable-atomic"
 version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
 
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
-
 [[package]]
 name = "precomputed-hash"
 version = "0.1.1"
@@ -3190,36 +1874,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
 [[package]]
 name = "raw-cpuid"
 version = "11.2.0"
@@ -3325,103 +1979,6 @@ version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
-[[package]]
-name = "reqwest"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
-dependencies = [
- "base64",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-tls",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
-[[package]]
-name = "rfc6979"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
-dependencies = [
- "hmac",
- "subtle",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rstest"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330"
-dependencies = [
- "futures",
- "futures-timer",
- "rstest_macros",
- "rustc_version",
-]
-
-[[package]]
-name = "rstest_macros"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25"
-dependencies = [
- "cfg-if",
- "glob",
- "proc-macro2",
- "quote",
- "regex",
- "relative-path",
- "rustc_version",
- "syn 2.0.72",
- "unicode-ident",
-]
-
 [[package]]
 name = "rust-analyzer-salsa"
 version = "0.17.0-pre.6"
@@ -3445,43 +2002,18 @@ version = "0.17.0-pre.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d96498e9684848c6676c399032ebc37c52da95ecbefa83d71ccc53b9f8a4a8e"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.72",
 ]
 
-[[package]]
-name = "rust_decimal"
-version = "1.35.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a"
-dependencies = [
- "arrayvec",
- "num-traits 0.2.19",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.34"
@@ -3495,46 +2027,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.23.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
-dependencies = [
- "once_cell",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
-dependencies = [
- "base64",
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.17"
@@ -3590,15 +2082,6 @@ dependencies = [
  "xxhash-rust",
 ]
 
-[[package]]
-name = "schannel"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "schemars"
 version = "0.8.21"
@@ -3630,29 +2113,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.23"
@@ -3725,29 +2185,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.8"
@@ -3778,28 +2215,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "sierra-compile"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "cairo-lang-sierra",
- "cairo-lang-sierra-to-casm",
- "cairo-lang-utils",
- "clap",
- "indoc",
- "log",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "siphasher"
 version = "0.3.11"
@@ -3830,150 +2245,31 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
 [[package]]
 name = "spinning_top"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
 dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "sprs"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec63571489873d4506683915840eeb1bb16b3198ee4894cc6f2fe3013d505e56"
-dependencies = [
- "ndarray",
- "num-complex",
- "num-traits 0.1.43",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "starknet-compile"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "cairo-lang-compiler",
- "cairo-lang-starknet",
- "cairo-lang-starknet-classes",
- "clap",
-]
-
-[[package]]
-name = "starknet-crypto"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e2c30c01e8eb0fc913c4ee3cf676389fffc1d1182bfe5bb9670e4e72e968064"
-dependencies = [
- "crypto-bigint",
- "hex",
- "hmac",
- "num-bigint",
- "num-integer",
- "num-traits 0.2.19",
- "rfc6979",
- "sha2",
- "starknet-crypto-codegen",
- "starknet-curve",
- "starknet-ff",
- "zeroize",
-]
-
-[[package]]
-name = "starknet-crypto-codegen"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbc159a1934c7be9761c237333a57febe060ace2bc9e3b337a59a37af206d19f"
-dependencies = [
- "starknet-curve",
- "starknet-ff",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "starknet-curve"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1c383518bb312751e4be80f53e8644034aa99a0afb29d7ac41b89a997db875b"
-dependencies = [
- "starknet-ff",
-]
-
-[[package]]
-name = "starknet-ff"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abf1b44ec5b18d87c1ae5f54590ca9d0699ef4dd5b2ffa66fc97f24613ec585"
-dependencies = [
- "ark-ff",
- "crypto-bigint",
- "getrandom",
- "hex",
-]
-
-[[package]]
-name = "starknet-sierra-compile"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "cairo-lang-sierra",
- "cairo-lang-starknet-classes",
- "cairo-lang-utils",
- "clap",
- "serde",
- "serde_json",
+ "lock_api",
 ]
 
 [[package]]
-name = "starknet-sierra-extract-code"
-version = "2.8.5"
+name = "sprs"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec63571489873d4506683915840eeb1bb16b3198ee4894cc6f2fe3013d505e56"
 dependencies = [
- "anyhow",
- "cairo-lang-starknet-classes",
- "clap",
- "serde_json",
+ "ndarray",
+ "num-complex",
+ "num-traits 0.1.43",
 ]
 
 [[package]]
-name = "starknet-sierra-upgrade-validate"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "async-channel",
- "cairo-lang-starknet-classes",
- "cairo-lang-utils",
- "clap",
- "indicatif",
- "openssl",
- "reqwest",
- "serde",
- "serde_json",
- "tokio",
-]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "starknet-types-core"
@@ -4003,18 +2299,6 @@ dependencies = [
  "precomputed-hash",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -4037,33 +2321,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -4100,39 +2357,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
-[[package]]
-name = "test-case"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
-dependencies = [
- "test-case-macros",
-]
-
-[[package]]
-name = "test-case-core"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f"
-dependencies = [
- "cfg-if",
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "test-case-macros"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
- "test-case-core",
-]
-
 [[package]]
 name = "test-log"
 version = "0.2.16"
@@ -4155,39 +2379,6 @@ dependencies = [
  "syn 2.0.72",
 ]
 
-[[package]]
-name = "tests"
-version = "2.8.5"
-dependencies = [
- "assert_matches",
- "cairo-lang-casm",
- "cairo-lang-compiler",
- "cairo-lang-defs",
- "cairo-lang-diagnostics",
- "cairo-lang-filesystem",
- "cairo-lang-lowering",
- "cairo-lang-parser",
- "cairo-lang-plugins",
- "cairo-lang-runner",
- "cairo-lang-semantic",
- "cairo-lang-sierra",
- "cairo-lang-sierra-gas",
- "cairo-lang-sierra-generator",
- "cairo-lang-sierra-to-casm",
- "cairo-lang-syntax",
- "cairo-lang-test-utils",
- "cairo-lang-utils",
- "env_logger",
- "itertools 0.12.1",
- "log",
- "num-bigint",
- "pretty_assertions",
- "rstest",
- "rust-analyzer-salsa",
- "starknet-types-core",
- "test-log",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.63"
@@ -4208,26 +2399,6 @@ dependencies = [
  "syn 2.0.72",
 ]
 
-[[package]]
-name = "thiserror-impl-no-std"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58e6318948b519ba6dc2b442a6d0b904ebfb8d411a3ad3e07843615a72249758"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "thiserror-no-std"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ad459d94dd517257cc96add8a43190ee620011bb6e6cdc82dafd97dfafafea"
-dependencies = [
- "thiserror-impl-no-std",
-]
-
 [[package]]
 name = "thread_local"
 version = "1.1.8"
@@ -4238,39 +2409,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "time"
-version = "0.3.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
-dependencies = [
- "deranged",
- "itoa",
- "libc",
- "num-conv",
- "num_threads",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -4295,69 +2433,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
-[[package]]
-name = "tokio"
-version = "1.39.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
-dependencies = [
- "rustls",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "toml"
 version = "0.8.19"
@@ -4403,33 +2478,6 @@ dependencies = [
  "winnow 0.6.18",
 ]
 
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
 [[package]]
 name = "tracing"
 version = "0.1.40"
@@ -4512,12 +2560,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -4568,9 +2610,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-xid"
@@ -4578,12 +2620,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
 [[package]]
 name = "url"
 version = "2.5.2"
@@ -4608,24 +2644,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
 [[package]]
 name = "version_check"
 version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
-[[package]]
-name = "virtue"
-version = "0.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314"
-
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -4636,15 +2660,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -4676,18 +2691,6 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.92"
@@ -4924,16 +2927,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -4976,7 +2969,6 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
- "byteorder",
  "zerocopy-derive",
 ]
 
@@ -4990,72 +2982,3 @@ dependencies = [
  "quote",
  "syn 2.0.72",
 ]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
-[[package]]
-name = "zip"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
-dependencies = [
- "aes",
- "byteorder",
- "bzip2",
- "constant_time_eq",
- "crc32fast",
- "crossbeam-utils",
- "flate2",
- "hmac",
- "pbkdf2",
- "sha1",
- "time",
- "zstd",
-]
-
-[[package]]
-name = "zstd"
-version = "0.11.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
-dependencies = [
- "cc",
- "pkg-config",
-]
diff --git a/crates/cairo-lang-language-server/Cargo.toml b/crates/cairo-lang-language-server/Cargo.toml
index 074cdb29..7a31da5b 100644
--- a/crates/cairo-lang-language-server/Cargo.toml
+++ b/crates/cairo-lang-language-server/Cargo.toml
@@ -11,24 +11,24 @@ testing = []
 
 [dependencies]
 anyhow.workspace = true
-cairo-lang-compiler = { path = "../cairo-lang-compiler", version = "~2.8.5" }
-cairo-lang-defs = { path = "../cairo-lang-defs", version = "~2.8.5" }
-cairo-lang-diagnostics = { path = "../cairo-lang-diagnostics", version = "~2.8.5" }
-cairo-lang-doc = { path = "../cairo-lang-doc", version = "~2.8.5" }
-cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.8.5" }
-cairo-lang-formatter = { path = "../cairo-lang-formatter", version = "~2.8.5" }
-cairo-lang-lowering = { path = "../cairo-lang-lowering", version = "~2.8.5" }
-cairo-lang-parser = { path = "../cairo-lang-parser", version = "~2.8.5" }
-cairo-lang-project = { path = "../cairo-lang-project", version = "~2.8.5" }
-cairo-lang-semantic = { path = "../cairo-lang-semantic", version = "~2.8.5" }
-cairo-lang-starknet = { path = "../cairo-lang-starknet", version = "~2.8.5" }
-cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.8.5" }
-cairo-lang-test-plugin = { path = "../cairo-lang-test-plugin", version = "~2.8.5" }
-cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.8.5" }
+cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
 cairo-lang-macro = "0.1.1"
 convert_case.workspace = true
 crossbeam = "0.8.4"
-governor = { version = "0.7.0", default-features = false, features = ["std", "quanta"]}
+governor = { version = "0.7.0", default-features = false, features = ["std", "quanta"] }
 indent.workspace = true
 indoc.workspace = true
 itertools.workspace = true
@@ -54,7 +54,7 @@ libc = "0.2.155"
 [dev-dependencies]
 assert_fs = "1.1"
 cairo-lang-language-server = { path = ".", features = ["testing"] }
-cairo-lang-test-utils = { path = "../cairo-lang-test-utils", features = ["testing"] }
+cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b", features = ["testing"] }
 pathdiff = "0.2"
 pretty_assertions.workspace = true
 test-log.workspace = true

From afda02ddccf871fa3e654077520d2db458327fdc Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Wed, 27 Nov 2024 10:46:13 +0100
Subject: [PATCH 04/23] Remove `[workspace.dependencies]`

---
 Cargo.lock                                   | 105 -------------------
 Cargo.toml                                   |  65 ------------
 crates/cairo-lang-language-server/Cargo.toml |  21 ++--
 3 files changed, 10 insertions(+), 181 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6e16b1f3..e1acce86 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,55 +29,12 @@ version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
-[[package]]
-name = "anstream"
-version = "0.6.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
 [[package]]
 name = "anstyle"
 version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
-[[package]]
-name = "anstyle-parse"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.86"
@@ -376,7 +333,6 @@ dependencies = [
  "serde_json",
  "smol_str",
  "tempfile",
- "test-log",
  "tracing",
  "tracing-chrome",
  "tracing-subscriber",
@@ -776,12 +732,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "colorchoice"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
 [[package]]
 name = "colored"
 version = "2.1.0"
@@ -1004,27 +954,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "env_filter"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "log",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -1317,12 +1246,6 @@ version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
 [[package]]
 name = "itertools"
 version = "0.11.0"
@@ -2357,28 +2280,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
-[[package]]
-name = "test-log"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
-dependencies = [
- "env_logger",
- "test-log-macros",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "test-log-macros"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.72",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.63"
@@ -2632,12 +2533,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
 [[package]]
 name = "valuable"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 6c7d971e..bdd6e888 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,10 +7,6 @@ inherits = "dev"
 incremental = false
 [profile.ci.package."*"] # external dependencies
 opt-level = 1
-[profile.ci.package."tokio"]
-opt-level = 3
-[profile.ci.package."bimap"]
-opt-level = 3
 [profile.ci.package."rust-analyzer-salsa"]
 opt-level = 3
 
@@ -27,64 +23,3 @@ edition = "2021"
 repository = "https://github.com/starkware-libs/cairo/"
 license = "Apache-2.0"
 license-file = "LICENSE"
-
-[workspace.dependencies]
-anyhow = "1.0.83"
-ark-ff = "0.4.2"
-ark-secp256k1 = "0.4.0"
-ark-secp256r1 = "0.4.0"
-ark-std = "0.4.0"
-assert_matches = "1.5"
-bimap = "0.6.3"
-cairo-vm = { version = "1.0.1", features = ["mod_builtin"] }
-clap = { version = "4.5.4", features = ["derive"] }
-colored = "2.1.0"
-const-fnv1a-hash = "1.1.0"
-const_format = "0.2.32"
-convert_case = "0.6.0"
-derivative = "2.2.0"
-diffy = "0.3.0"
-env_logger = "0.11.3"
-genco = "0.17.8"
-good_lp = { version = "1.8.1", features = ["minilp"], default-features = false }
-hashbrown = "0.14.5"
-id-arena = "2.2.1"
-ignore = "0.4.22"
-indent = "0.1.1"
-indexmap = { version = "2.2.6", default-features = false }
-indoc = "2.0.5"
-itertools = { version = "0.12.1", default-features = false }
-keccak = "0.1.5"
-lalrpop-util = { version = "0.20.2", features = ["lexer"] }
-log = "0.4.21"
-num-bigint = { version = "0.4.5", default-features = false }
-num-integer = "0.1.46"
-num-traits = { version = "0.2.19", default-features = false }
-parity-scale-codec = { version = "3.6.9", default-features = false, features = ["derive"] }
-path-clean = "1.0.1"
-pretty_assertions = "1.4.0"
-proc-macro2 = "1.0.82"
-quote = "1.0.36"
-rand = "0.8.5"
-rayon = "1.10.0"
-rstest = "0.19.0"
-salsa = { package = "rust-analyzer-salsa", version = "0.17.0-pre.6" }
-schemars = { version = "0.8.19", features = ["preserve_order"] }
-semver = { version = "1.0.23", features = ["serde"] }
-serde = { version = "1.0.200", default-features = false, features = ["derive"] }
-serde_json = "1.0.116"
-sha2 = "0.10.8"
-sha3 = "0.10.8"
-smol_str = { version = "0.2.0", features = ["serde"] }
-starknet-types-core = { version = "0.1.0", features = ["hash", "prime-bigint", "serde"] }
-syn = { version = "2.0.61", features = ["full", "extra-traits"] }
-test-case = "3.3.1"
-test-case-macros = "3.3.1"
-test-log = "0.2.16"
-thiserror = "1.0.60"
-time = { version = "0.3.36", features = ["formatting", "macros", "local-offset"] }
-tokio = { version = "1.37.0", features = ["full", "sync"] }
-toml = "0.8.12"
-unescaper = "0.1.2"
-xshell = "0.2.6"
-openssl = { version = "0.10.35" }
diff --git a/crates/cairo-lang-language-server/Cargo.toml b/crates/cairo-lang-language-server/Cargo.toml
index 7a31da5b..ec58019e 100644
--- a/crates/cairo-lang-language-server/Cargo.toml
+++ b/crates/cairo-lang-language-server/Cargo.toml
@@ -10,7 +10,7 @@ description = "Cairo language server."
 testing = []
 
 [dependencies]
-anyhow.workspace = true
+anyhow = "1.0.83"
 cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
 cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
 cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
@@ -26,23 +26,23 @@ cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "0d
 cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
 cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
 cairo-lang-macro = "0.1.1"
-convert_case.workspace = true
+convert_case = "0.6.0"
 crossbeam = "0.8.4"
 governor = { version = "0.7.0", default-features = false, features = ["std", "quanta"] }
-indent.workspace = true
-indoc.workspace = true
-itertools.workspace = true
+indent = "0.1.1"
+indoc = "2.0.5"
+itertools = { version = "0.12.1", default-features = false }
 jod-thread = "0.1.2"
 lsp-server = "0.7.7"
 lsp-types = "=0.95.0"
 rustc-hash = "1.1.0"
-salsa.workspace = true
+salsa = { package = "rust-analyzer-salsa", version = "0.17.0-pre.6" }
 scarb-metadata = "1.13"
 scarb-proc-macro-server-types = "0.1"
 scarb-stable-hash = "1.0.0"
-serde = { workspace = true, default-features = true }
-serde_json.workspace = true
-smol_str.workspace = true
+serde = { version = "1.0.200", default-features = false, features = ["derive"] }
+serde_json = "1.0.116"
+smol_str = { version = "0.2.0", features = ["serde"] }
 tempfile = "3"
 tracing = "0.1"
 tracing-chrome = "0.7.1"
@@ -56,5 +56,4 @@ assert_fs = "1.1"
 cairo-lang-language-server = { path = ".", features = ["testing"] }
 cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b", features = ["testing"] }
 pathdiff = "0.2"
-pretty_assertions.workspace = true
-test-log.workspace = true
+pretty_assertions = "1.4.0"

From 36d56bb27252f3c1f22a3046bbce4b2ff6bdab15 Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Wed, 27 Nov 2024 12:47:32 +0100
Subject: [PATCH 05/23] Relax some version specs

---
 crates/cairo-lang-language-server/Cargo.toml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/cairo-lang-language-server/Cargo.toml b/crates/cairo-lang-language-server/Cargo.toml
index ec58019e..872b5f36 100644
--- a/crates/cairo-lang-language-server/Cargo.toml
+++ b/crates/cairo-lang-language-server/Cargo.toml
@@ -10,7 +10,7 @@ description = "Cairo language server."
 testing = []
 
 [dependencies]
-anyhow = "1.0.83"
+anyhow = "1"
 cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
 cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
 cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
@@ -30,8 +30,8 @@ convert_case = "0.6.0"
 crossbeam = "0.8.4"
 governor = { version = "0.7.0", default-features = false, features = ["std", "quanta"] }
 indent = "0.1.1"
-indoc = "2.0.5"
-itertools = { version = "0.12.1", default-features = false }
+indoc = "2"
+itertools = "0.12.1"
 jod-thread = "0.1.2"
 lsp-server = "0.7.7"
 lsp-types = "=0.95.0"
@@ -39,8 +39,8 @@ rustc-hash = "1.1.0"
 salsa = { package = "rust-analyzer-salsa", version = "0.17.0-pre.6" }
 scarb-metadata = "1.13"
 scarb-proc-macro-server-types = "0.1"
-scarb-stable-hash = "1.0.0"
-serde = { version = "1.0.200", default-features = false, features = ["derive"] }
+scarb-stable-hash = "1"
+serde = { version = "1", default-features = false, features = ["derive"] }
 serde_json = "1.0.116"
 smol_str = { version = "0.2.0", features = ["serde"] }
 tempfile = "3"

From 0a590b05eafae77452002b597f86a40ea4b92628 Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 10:27:05 +0100
Subject: [PATCH 06/23] Cleanup .gitignore

---
 .gitignore | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 96a27287..0b19deb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,5 @@
 /target
 /.vscode
-.idea/
+/.idea
 .spr.yml
-node_modules
 .DS_Store
-perf.data*
-flamegraph.svg
-
-ensure-no_std/Cargo.lock
-ensure-no_std/target/

From b6dd06ae031fc3354548069d6b0bda14ed0208be Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 10:27:49 +0100
Subject: [PATCH 07/23] Remove clippy.toml

---
 clippy.toml | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 clippy.toml

diff --git a/clippy.toml b/clippy.toml
deleted file mode 100644
index c117dd79..00000000
--- a/clippy.toml
+++ /dev/null
@@ -1 +0,0 @@
-enum-variant-name-threshold = 1

From 1b6c2cc763ce35d694e2bdf8c380c8ea96243c9a Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 10:46:02 +0100
Subject: [PATCH 08/23] Update CONTRIBUTING.md

---
 .../CONTRIBUTING.md => CONTRIBUTING.md        | 64 ++++++++++++++-----
 1 file changed, 49 insertions(+), 15 deletions(-)
 rename crates/cairo-lang-language-server/CONTRIBUTING.md => CONTRIBUTING.md (52%)

diff --git a/crates/cairo-lang-language-server/CONTRIBUTING.md b/CONTRIBUTING.md
similarity index 52%
rename from crates/cairo-lang-language-server/CONTRIBUTING.md
rename to CONTRIBUTING.md
index 6b994263..3938e60c 100644
--- a/crates/cairo-lang-language-server/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,27 +1,38 @@
 # Contributing to CairoLS
 
-This document is a supplement to the [general contributing guidelines](../../docs/CONTRIBUTING.md)
-for the Cairo repository.
-Please read that document first carefully before proceeding with the instructions below.
+CairoLS is actively developed and open for contributions!
 
-This document you are using Visual Studio Code with the [Cairo extension](../../vscode-cairo) as the
-editor of choice for running CairoLS against.
-You might also want to check out
-the [Cairo extension's contributing guidelines](../../vscode-cairo/CONTRIBUTING.md).
+*Want to get started?*
+Grab any unassigned issue labelled with [
+`help wanted`](https://github.com/software-mansion/cairols/labels/help%20wanted)!
+
+*Looking for some easy warmup tasks?*
+Check out issues labelled with [
+`good first issue`](https://github.com/software-mansion/cairols/labels/good%20first%20issue)!
+
+When contributing to this repository, please first discuss the change you wish to make via issue,
+email, or any other method with the owners of this repository before making a change.
 
-## Commits
+## Environment setup
 
-If your commit/pull request is solely related to CairoLS, please prefix your commit message/PR title
-with `LS: `.
+The latest stable Rust is the only thing you really need.
+It is recommended to use [rustup](https://rustup.rs/) for getting it.
+
+This document assumes that you are using Visual Studio Code with
+the [Cairo extension](https://marketplace.visualstudio.com/items?itemName=starkware.cairo1) as the
+editor of choice for running CairoLS against.
+You might also want to check out
+the [Cairo extension's contributing guidelines](https://github.com/software-mansion/vscode-cairo/blob/main/CONTRIBUTING.md).
 
 ## Testing
 
-We are building an extensive end-to-end tests suite for CairoLS [here](./tests/e2e).
+We are building an extensive end-to-end tests suite for
+CairoLS [here](crates/cairo-lang-language-server/tests/e2e).
 These tests implement a simple language client that you can control (like put a cursor at certain
 position, send a request to the server, etc.).
 Check out existing tests for examples of what you can do.
-If you need, do not hesitate to extend the language client with new capabilities!
-Its source code is located [here](./tests/e2e/support/mod.rs).
+If you need, don’t hesitate to extend the language client with new capabilities!
+Its source code is located [here](crates/cairo-lang-language-server/tests/e2e/support/mod.rs).
 
 > [!IMPORTANT]
 > The test suite is not complete, but we **require** adding tests for any new developments.
@@ -64,8 +75,8 @@ To generate a profile file, paste the following into your `.vscode/settings.json
 }
 ```
 
-This will generate a trace file that you'll be able to further analyze.
-CairoLS will print the path to this trace file and instructions on how to analyze it on its standard
+This will generate a trace file that you'll be able to further analyse.
+CairoLS will print the path to this trace file and instructions on how to analyse it on its standard
 error.
 In Visual Studio Code you will find this output in the `Output` → `Cairo Language Server` panel.
 We're not copying these here because nobody will bother keeping this document in sync.
@@ -79,4 +90,27 @@ automated),
 but you will also enable future developers not to fall into the pitfall that caused the bug you
 found and debugged 🤓.
 
+## Git
+
+Try to make small PRs that could be squashed into a single commit.
+For larger work, try to make your commits small, self-contained, and well-described.
+Each commit should pass lints and tests.
+Then, set up a stack of pull requests, separate PR for each commit, and pointing to the previous
+one.
+
+While your PR is being reviewed on, you can push merge commits and use [
+`git commit --fixup`](https://git-scm.com/docs/git-commit/2.32.0#Documentation/git-commit.txt---fixupamendrewordltcommitgt)
+to push further changes to your commits.
+
+## Typos
+
+Our policy is to not accept PRs that only fix typos in the documentation and code.
+We appreciate your effort, but we encourage you to focus on bugs and features instead.
+
+---
+
+Thanks! ❤️ ❤️ ❤️
+
+CairoLS Team
+
 [env-filter-directives]: https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#directives

From 833258904877420759e1448c43ed0db820f4b16c Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 10:55:55 +0100
Subject: [PATCH 09/23] Combine everything into a single crate
 `cairo-language-server`

---
 CONTRIBUTING.md                               |   2 +-
 Cargo.lock                                    | 198 +++++++++++++-----
 Cargo.toml                                    |  78 +++++--
 crates/bin/cairo-language-server/Cargo.toml   |  10 -
 crates/cairo-lang-language-server/Cargo.toml  |  59 ------
 .../src => src}/config.rs                     |   0
 .../src => src}/env_config.rs                 |   0
 .../ide/code_actions/add_missing_trait.rs     |   0
 .../ide/code_actions/expand_macro.rs          |   0
 .../ide/code_actions/fill_struct_fields.rs    |   0
 .../src => src}/ide/code_actions/mod.rs       |   0
 .../code_actions/rename_unused_variable.rs    |   0
 .../src => src}/ide/completion/completions.rs |   0
 .../src => src}/ide/completion/mod.rs         |   0
 .../src => src}/ide/formatter.rs              |   0
 .../src => src}/ide/hover/mod.rs              |   0
 .../ide/hover/render/definition.rs            |   0
 .../src => src}/ide/hover/render/legacy.rs    |   0
 .../src => src}/ide/hover/render/literal.rs   |   0
 .../src => src}/ide/hover/render/markdown.rs  |   0
 .../src => src}/ide/hover/render/mod.rs       |   0
 .../src => src}/ide/macros/expand.rs          |   0
 .../src => src}/ide/macros/mod.rs             |   0
 .../src => src}/ide/mod.rs                    |   0
 .../ide/navigation/goto_definition.rs         |   0
 .../src => src}/ide/navigation/mod.rs         |   0
 .../ide/semantic_highlighting/encoder.rs      |   0
 .../ide/semantic_highlighting/mod.rs          |   0
 .../ide/semantic_highlighting/token_kind.rs   |   0
 .../src => src}/lang/db/mod.rs                |   0
 .../src => src}/lang/db/semantic.rs           |   0
 .../src => src}/lang/db/swapper.rs            |   0
 .../src => src}/lang/db/syntax.rs             |   0
 .../lang/diagnostics/file_batches.rs          |   0
 .../lang/diagnostics/file_diagnostics.rs      |   0
 .../src => src}/lang/diagnostics/lsp.rs       |   0
 .../src => src}/lang/diagnostics/mod.rs       |   0
 .../lang/diagnostics/project_diagnostics.rs   |   0
 .../src => src}/lang/diagnostics/refresh.rs   |   0
 .../src => src}/lang/diagnostics/trigger.rs   |   0
 .../lang/diagnostics/trigger_test.rs          |   0
 .../src => src}/lang/inspect/crates.rs        |   0
 .../src => src}/lang/inspect/defs.rs          |   0
 .../src => src}/lang/inspect/methods.rs       |   0
 .../src => src}/lang/inspect/mod.rs           |   0
 .../src => src}/lang/lsp/ls_proto_group.rs    |   0
 .../lang/lsp/ls_proto_group_test.rs           |   0
 .../src => src}/lang/lsp/mod.rs               |   0
 .../src => src}/lang/lsp/to_lsp.rs            |   0
 .../src => src}/lang/mod.rs                   |   0
 .../lang/proc_macros/client/connection.rs     |   0
 .../lang/proc_macros/client/id_generator.rs   |   0
 .../lang/proc_macros/client/mod.rs            |   0
 .../lang/proc_macros/client/status.rs         |   0
 .../lang/proc_macros/controller.rs            |   0
 .../src => src}/lang/proc_macros/db.rs        |   0
 .../src => src}/lang/proc_macros/mod.rs       |   0
 .../lang/proc_macros/plugins/downcast.rs      |   0
 .../lang/proc_macros/plugins/mod.rs           |   0
 .../lang/proc_macros/plugins/scarb/inline.rs  |   0
 .../lang/proc_macros/plugins/scarb/mod.rs     |   0
 .../lang/proc_macros/plugins/scarb/regular.rs |   0
 .../src => src}/lib.rs                        |   6 +-
 .../src => src}/lsp/capabilities/client.rs    |   0
 .../src => src}/lsp/capabilities/mod.rs       |   0
 .../src => src}/lsp/capabilities/server.rs    |   0
 .../src => src}/lsp/ext.rs                    |   0
 .../src => src}/lsp/mod.rs                    |   0
 .../src => src}/lsp/result.rs                 |   0
 .../cairo-language-server/src => src}/main.rs |   2 +-
 .../src => src}/project/crate_data.rs         |   0
 .../src => src}/project/mod.rs                |   0
 .../project/project_manifest_path.rs          |   0
 .../project/project_manifest_path_test.rs     |   0
 .../src => src}/project/scarb.rs              |   0
 .../project/unmanaged_core_crate.rs           |   0
 .../src => src}/server/client.rs              |   0
 .../src => src}/server/commands.rs            |   0
 .../src => src}/server/connection.rs          |   0
 .../src => src}/server/mod.rs                 |   0
 .../src => src}/server/panic.rs               |   0
 .../src => src}/server/routing/mod.rs         |   0
 .../src => src}/server/routing/traits.rs      |   0
 .../src => src}/server/schedule/mod.rs        |   0
 .../src => src}/server/schedule/task.rs       |   0
 .../src => src}/server/schedule/thread/mod.rs |   0
 .../server/schedule/thread/pool.rs            |   0
 .../server/schedule/thread/priority.rs        |   0
 .../src => src}/state.rs                      |   0
 .../src => src}/toolchain/mod.rs              |   0
 .../src => src}/toolchain/scarb.rs            |   0
 .../tests => tests}/e2e/analysis.rs           |   2 +-
 .../tests => tests}/e2e/code_actions.rs       |   0
 .../tests => tests}/e2e/completions.rs        |   0
 .../tests => tests}/e2e/goto.rs               |   0
 .../tests => tests}/e2e/hover.rs              |   0
 .../tests => tests}/e2e/macro_expand.rs       |   2 +-
 .../tests => tests}/e2e/main.rs               |   0
 .../tests => tests}/e2e/semantic_tokens.rs    |   0
 .../e2e/support/client_capabilities.rs        |   0
 .../tests => tests}/e2e/support/cursor.rs     |   0
 .../e2e/support/cursor_test.rs                |   0
 .../tests => tests}/e2e/support/fixture.rs    |   0
 .../tests => tests}/e2e/support/jsonrpc.rs    |   0
 .../e2e/support/mock_client.rs                |   2 +-
 .../tests => tests}/e2e/support/mod.rs        |   0
 .../tests => tests}/e2e/support/normalize.rs  |   0
 .../e2e/workspace_configuration.rs            |   0
 .../code_actions/fill_struct_fields.txt       |   0
 .../test_data/code_actions/macro_expand.txt   |   0
 .../test_data/code_actions/missing_trait.txt  |   0
 .../completions/methods_text_edits.txt        |   0
 .../test_data/completions/module_items.txt    |   0
 .../test_data/completions/structs.txt         |   0
 .../test_data/goto/struct_members.txt         |   0
 .../tests => tests}/test_data/hover/basic.txt |   0
 .../test_data/hover/literals.txt              |   0
 .../test_data/hover/missing_module.txt        |   0
 .../test_data/hover/partial.txt               |   0
 .../tests => tests}/test_data/hover/paths.txt |   0
 .../test_data/hover/starknet.txt              |   0
 .../test_data/hover/structs.txt               |   0
 .../test_data/macro_expand/attribute.txt      |   0
 .../test_data/macro_expand/derive.txt         |   0
 .../test_data/macro_expand/empty.txt          |   0
 .../test_data/macro_expand/simple_inline.txt  |   0
 126 files changed, 220 insertions(+), 141 deletions(-)
 delete mode 100644 crates/bin/cairo-language-server/Cargo.toml
 delete mode 100644 crates/cairo-lang-language-server/Cargo.toml
 rename {crates/cairo-lang-language-server/src => src}/config.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/env_config.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/code_actions/add_missing_trait.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/code_actions/expand_macro.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/code_actions/fill_struct_fields.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/code_actions/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/code_actions/rename_unused_variable.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/completion/completions.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/completion/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/formatter.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/hover/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/hover/render/definition.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/hover/render/legacy.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/hover/render/literal.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/hover/render/markdown.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/hover/render/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/macros/expand.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/macros/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/navigation/goto_definition.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/navigation/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/semantic_highlighting/encoder.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/semantic_highlighting/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/ide/semantic_highlighting/token_kind.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/db/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/db/semantic.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/db/swapper.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/db/syntax.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/diagnostics/file_batches.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/diagnostics/file_diagnostics.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/diagnostics/lsp.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/diagnostics/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/diagnostics/project_diagnostics.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/diagnostics/refresh.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/diagnostics/trigger.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/diagnostics/trigger_test.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/inspect/crates.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/inspect/defs.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/inspect/methods.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/inspect/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/lsp/ls_proto_group.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/lsp/ls_proto_group_test.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/lsp/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/lsp/to_lsp.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/client/connection.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/client/id_generator.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/client/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/client/status.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/controller.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/db.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/plugins/downcast.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/plugins/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/plugins/scarb/inline.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/plugins/scarb/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lang/proc_macros/plugins/scarb/regular.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lib.rs (99%)
 rename {crates/cairo-lang-language-server/src => src}/lsp/capabilities/client.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lsp/capabilities/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lsp/capabilities/server.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lsp/ext.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lsp/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/lsp/result.rs (100%)
 rename {crates/bin/cairo-language-server/src => src}/main.rs (57%)
 rename {crates/cairo-lang-language-server/src => src}/project/crate_data.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/project/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/project/project_manifest_path.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/project/project_manifest_path_test.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/project/scarb.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/project/unmanaged_core_crate.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/client.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/commands.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/connection.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/panic.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/routing/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/routing/traits.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/schedule/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/schedule/task.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/schedule/thread/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/schedule/thread/pool.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/server/schedule/thread/priority.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/state.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/toolchain/mod.rs (100%)
 rename {crates/cairo-lang-language-server/src => src}/toolchain/scarb.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/analysis.rs (99%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/code_actions.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/completions.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/goto.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/hover.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/macro_expand.rs (97%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/main.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/semantic_tokens.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/support/client_capabilities.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/support/cursor.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/support/cursor_test.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/support/fixture.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/support/jsonrpc.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/support/mock_client.rs (99%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/support/mod.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/support/normalize.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/e2e/workspace_configuration.rs (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/code_actions/fill_struct_fields.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/code_actions/macro_expand.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/code_actions/missing_trait.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/completions/methods_text_edits.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/completions/module_items.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/completions/structs.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/goto/struct_members.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/hover/basic.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/hover/literals.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/hover/missing_module.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/hover/partial.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/hover/paths.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/hover/starknet.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/hover/structs.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/macro_expand/attribute.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/macro_expand/derive.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/macro_expand/empty.txt (100%)
 rename {crates/cairo-lang-language-server/tests => tests}/test_data/macro_expand/simple_inline.txt (100%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3938e60c..4caea30c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,7 +53,7 @@ To do so, paste the following into your `.vscode/settings.json`:
 ```json
 {
     "cairo1.languageServerExtraEnv": {
-        "CAIRO_LS_LOG": "cairo_lang_language_server=debug",
+        "CAIRO_LS_LOG": "cairo_language_server=debug",
         "RUST_BACKTRACE": "1"
     }
 }
diff --git a/Cargo.lock b/Cargo.lock
index e1acce86..8c11ad37 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,12 +29,55 @@ version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
 [[package]]
 name = "anstyle"
 version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.86"
@@ -289,55 +332,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "cairo-lang-language-server"
-version = "2.8.5"
-dependencies = [
- "anyhow",
- "assert_fs",
- "cairo-lang-compiler",
- "cairo-lang-defs",
- "cairo-lang-diagnostics",
- "cairo-lang-doc",
- "cairo-lang-filesystem",
- "cairo-lang-formatter",
- "cairo-lang-language-server",
- "cairo-lang-lowering",
- "cairo-lang-macro",
- "cairo-lang-parser",
- "cairo-lang-project",
- "cairo-lang-semantic",
- "cairo-lang-starknet",
- "cairo-lang-syntax",
- "cairo-lang-test-plugin",
- "cairo-lang-test-utils",
- "cairo-lang-utils",
- "convert_case",
- "crossbeam",
- "governor",
- "indent",
- "indoc",
- "itertools 0.12.1",
- "jod-thread",
- "libc",
- "lsp-server",
- "lsp-types",
- "pathdiff",
- "pretty_assertions",
- "rust-analyzer-salsa",
- "rustc-hash",
- "scarb-metadata",
- "scarb-proc-macro-server-types",
- "scarb-stable-hash",
- "serde",
- "serde_json",
- "smol_str",
- "tempfile",
- "tracing",
- "tracing-chrome",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "cairo-lang-lowering"
 version = "2.8.5"
@@ -714,7 +708,50 @@ dependencies = [
 name = "cairo-language-server"
 version = "2.8.5"
 dependencies = [
- "cairo-lang-language-server",
+ "anyhow",
+ "assert_fs",
+ "cairo-lang-compiler",
+ "cairo-lang-defs",
+ "cairo-lang-diagnostics",
+ "cairo-lang-doc",
+ "cairo-lang-filesystem",
+ "cairo-lang-formatter",
+ "cairo-lang-lowering",
+ "cairo-lang-macro",
+ "cairo-lang-parser",
+ "cairo-lang-project",
+ "cairo-lang-semantic",
+ "cairo-lang-starknet",
+ "cairo-lang-syntax",
+ "cairo-lang-test-plugin",
+ "cairo-lang-test-utils",
+ "cairo-lang-utils",
+ "cairo-language-server",
+ "convert_case",
+ "crossbeam",
+ "governor",
+ "indent",
+ "indoc",
+ "itertools 0.12.1",
+ "jod-thread",
+ "libc",
+ "lsp-server",
+ "lsp-types",
+ "pathdiff",
+ "pretty_assertions",
+ "rust-analyzer-salsa",
+ "rustc-hash",
+ "scarb-metadata",
+ "scarb-proc-macro-server-types",
+ "scarb-stable-hash",
+ "serde",
+ "serde_json",
+ "smol_str",
+ "tempfile",
+ "test-log",
+ "tracing",
+ "tracing-chrome",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -732,6 +769,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
 [[package]]
 name = "colored"
 version = "2.1.0"
@@ -954,6 +997,27 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "env_filter"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -1246,6 +1310,12 @@ version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "itertools"
 version = "0.11.0"
@@ -2280,6 +2350,28 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
+[[package]]
+name = "test-log"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
+dependencies = [
+ "env_logger",
+ "test-log-macros",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "test-log-macros"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.63"
@@ -2533,6 +2625,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index bdd6e888..6c6548ba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,67 @@
+[package]
+name = "cairo-language-server"
+version = "2.8.5"
+edition = "2021"
+
+authors = ["Software Mansion <contact@swmansion.com>", "StarkWare <info@starkware.co>"]
+description = "The Cairo Language Server"
+license = "Apache-2.0"
+repository = "https://github.com/software-mansion/cairols"
+
+[features]
+testing = []
+
+[dependencies]
+anyhow = "1"
+cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-macro = "0.1.1"
+convert_case = "0.6.0"
+crossbeam = "0.8.4"
+governor = { version = "0.7.0", default-features = false, features = ["std", "quanta"] }
+indent = "0.1.1"
+indoc = "2"
+itertools = "0.12.1"
+jod-thread = "0.1.2"
+lsp-server = "0.7.7"
+lsp-types = "=0.95.0"
+rustc-hash = "1.1.0"
+salsa = { package = "rust-analyzer-salsa", version = "0.17.0-pre.6" }
+scarb-metadata = "1.13"
+scarb-proc-macro-server-types = "0.1"
+scarb-stable-hash = "1"
+serde = { version = "1", default-features = false, features = ["derive"] }
+serde_json = "1.0.116"
+smol_str = { version = "0.2.0", features = ["serde"] }
+tempfile = "3"
+tracing = "0.1"
+tracing-chrome = "0.7.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+
+[target.'cfg(target_vendor = "apple")'.dependencies]
+libc = "0.2.155"
+
+[dev-dependencies]
+assert_fs = "1.1"
+cairo-language-server = { path = ".", features = ["testing"] }
+cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b", features = ["testing"] }
+pathdiff = "0.2"
+pretty_assertions = "1.4.0"
+test-log = "0.2.16"
+
+
 # The profile used for CI in pull requests.
 # External dependencies are built with optimisation enabled,
 # while crates in this workspace are built with `dev` profile and full debug info.
@@ -9,17 +73,3 @@ incremental = false
 opt-level = 1
 [profile.ci.package."rust-analyzer-salsa"]
 opt-level = 3
-
-[workspace]
-resolver = "2"
-members = [
-    "crates/cairo-lang-language-server",
-    "crates/bin/cairo-language-server",
-]
-
-[workspace.package]
-version = "2.8.5"
-edition = "2021"
-repository = "https://github.com/starkware-libs/cairo/"
-license = "Apache-2.0"
-license-file = "LICENSE"
diff --git a/crates/bin/cairo-language-server/Cargo.toml b/crates/bin/cairo-language-server/Cargo.toml
deleted file mode 100644
index a4347bef..00000000
--- a/crates/bin/cairo-language-server/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[package]
-name = "cairo-language-server"
-version.workspace = true
-edition.workspace = true
-repository.workspace = true
-license-file.workspace = true
-description = "Language server executable for the Cairo programming language"
-
-[dependencies]
-cairo-lang-language-server = { path = "../../cairo-lang-language-server", version = "~2.8.5" }
diff --git a/crates/cairo-lang-language-server/Cargo.toml b/crates/cairo-lang-language-server/Cargo.toml
deleted file mode 100644
index 872b5f36..00000000
--- a/crates/cairo-lang-language-server/Cargo.toml
+++ /dev/null
@@ -1,59 +0,0 @@
-[package]
-name = "cairo-lang-language-server"
-version.workspace = true
-edition.workspace = true
-repository.workspace = true
-license-file.workspace = true
-description = "Cairo language server."
-
-[features]
-testing = []
-
-[dependencies]
-anyhow = "1"
-cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-macro = "0.1.1"
-convert_case = "0.6.0"
-crossbeam = "0.8.4"
-governor = { version = "0.7.0", default-features = false, features = ["std", "quanta"] }
-indent = "0.1.1"
-indoc = "2"
-itertools = "0.12.1"
-jod-thread = "0.1.2"
-lsp-server = "0.7.7"
-lsp-types = "=0.95.0"
-rustc-hash = "1.1.0"
-salsa = { package = "rust-analyzer-salsa", version = "0.17.0-pre.6" }
-scarb-metadata = "1.13"
-scarb-proc-macro-server-types = "0.1"
-scarb-stable-hash = "1"
-serde = { version = "1", default-features = false, features = ["derive"] }
-serde_json = "1.0.116"
-smol_str = { version = "0.2.0", features = ["serde"] }
-tempfile = "3"
-tracing = "0.1"
-tracing-chrome = "0.7.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-
-[target.'cfg(target_vendor = "apple")'.dependencies]
-libc = "0.2.155"
-
-[dev-dependencies]
-assert_fs = "1.1"
-cairo-lang-language-server = { path = ".", features = ["testing"] }
-cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b", features = ["testing"] }
-pathdiff = "0.2"
-pretty_assertions = "1.4.0"
diff --git a/crates/cairo-lang-language-server/src/config.rs b/src/config.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/config.rs
rename to src/config.rs
diff --git a/crates/cairo-lang-language-server/src/env_config.rs b/src/env_config.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/env_config.rs
rename to src/env_config.rs
diff --git a/crates/cairo-lang-language-server/src/ide/code_actions/add_missing_trait.rs b/src/ide/code_actions/add_missing_trait.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/code_actions/add_missing_trait.rs
rename to src/ide/code_actions/add_missing_trait.rs
diff --git a/crates/cairo-lang-language-server/src/ide/code_actions/expand_macro.rs b/src/ide/code_actions/expand_macro.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/code_actions/expand_macro.rs
rename to src/ide/code_actions/expand_macro.rs
diff --git a/crates/cairo-lang-language-server/src/ide/code_actions/fill_struct_fields.rs b/src/ide/code_actions/fill_struct_fields.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/code_actions/fill_struct_fields.rs
rename to src/ide/code_actions/fill_struct_fields.rs
diff --git a/crates/cairo-lang-language-server/src/ide/code_actions/mod.rs b/src/ide/code_actions/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/code_actions/mod.rs
rename to src/ide/code_actions/mod.rs
diff --git a/crates/cairo-lang-language-server/src/ide/code_actions/rename_unused_variable.rs b/src/ide/code_actions/rename_unused_variable.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/code_actions/rename_unused_variable.rs
rename to src/ide/code_actions/rename_unused_variable.rs
diff --git a/crates/cairo-lang-language-server/src/ide/completion/completions.rs b/src/ide/completion/completions.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/completion/completions.rs
rename to src/ide/completion/completions.rs
diff --git a/crates/cairo-lang-language-server/src/ide/completion/mod.rs b/src/ide/completion/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/completion/mod.rs
rename to src/ide/completion/mod.rs
diff --git a/crates/cairo-lang-language-server/src/ide/formatter.rs b/src/ide/formatter.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/formatter.rs
rename to src/ide/formatter.rs
diff --git a/crates/cairo-lang-language-server/src/ide/hover/mod.rs b/src/ide/hover/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/hover/mod.rs
rename to src/ide/hover/mod.rs
diff --git a/crates/cairo-lang-language-server/src/ide/hover/render/definition.rs b/src/ide/hover/render/definition.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/hover/render/definition.rs
rename to src/ide/hover/render/definition.rs
diff --git a/crates/cairo-lang-language-server/src/ide/hover/render/legacy.rs b/src/ide/hover/render/legacy.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/hover/render/legacy.rs
rename to src/ide/hover/render/legacy.rs
diff --git a/crates/cairo-lang-language-server/src/ide/hover/render/literal.rs b/src/ide/hover/render/literal.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/hover/render/literal.rs
rename to src/ide/hover/render/literal.rs
diff --git a/crates/cairo-lang-language-server/src/ide/hover/render/markdown.rs b/src/ide/hover/render/markdown.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/hover/render/markdown.rs
rename to src/ide/hover/render/markdown.rs
diff --git a/crates/cairo-lang-language-server/src/ide/hover/render/mod.rs b/src/ide/hover/render/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/hover/render/mod.rs
rename to src/ide/hover/render/mod.rs
diff --git a/crates/cairo-lang-language-server/src/ide/macros/expand.rs b/src/ide/macros/expand.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/macros/expand.rs
rename to src/ide/macros/expand.rs
diff --git a/crates/cairo-lang-language-server/src/ide/macros/mod.rs b/src/ide/macros/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/macros/mod.rs
rename to src/ide/macros/mod.rs
diff --git a/crates/cairo-lang-language-server/src/ide/mod.rs b/src/ide/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/mod.rs
rename to src/ide/mod.rs
diff --git a/crates/cairo-lang-language-server/src/ide/navigation/goto_definition.rs b/src/ide/navigation/goto_definition.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/navigation/goto_definition.rs
rename to src/ide/navigation/goto_definition.rs
diff --git a/crates/cairo-lang-language-server/src/ide/navigation/mod.rs b/src/ide/navigation/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/navigation/mod.rs
rename to src/ide/navigation/mod.rs
diff --git a/crates/cairo-lang-language-server/src/ide/semantic_highlighting/encoder.rs b/src/ide/semantic_highlighting/encoder.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/semantic_highlighting/encoder.rs
rename to src/ide/semantic_highlighting/encoder.rs
diff --git a/crates/cairo-lang-language-server/src/ide/semantic_highlighting/mod.rs b/src/ide/semantic_highlighting/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/semantic_highlighting/mod.rs
rename to src/ide/semantic_highlighting/mod.rs
diff --git a/crates/cairo-lang-language-server/src/ide/semantic_highlighting/token_kind.rs b/src/ide/semantic_highlighting/token_kind.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/ide/semantic_highlighting/token_kind.rs
rename to src/ide/semantic_highlighting/token_kind.rs
diff --git a/crates/cairo-lang-language-server/src/lang/db/mod.rs b/src/lang/db/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/db/mod.rs
rename to src/lang/db/mod.rs
diff --git a/crates/cairo-lang-language-server/src/lang/db/semantic.rs b/src/lang/db/semantic.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/db/semantic.rs
rename to src/lang/db/semantic.rs
diff --git a/crates/cairo-lang-language-server/src/lang/db/swapper.rs b/src/lang/db/swapper.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/db/swapper.rs
rename to src/lang/db/swapper.rs
diff --git a/crates/cairo-lang-language-server/src/lang/db/syntax.rs b/src/lang/db/syntax.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/db/syntax.rs
rename to src/lang/db/syntax.rs
diff --git a/crates/cairo-lang-language-server/src/lang/diagnostics/file_batches.rs b/src/lang/diagnostics/file_batches.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/diagnostics/file_batches.rs
rename to src/lang/diagnostics/file_batches.rs
diff --git a/crates/cairo-lang-language-server/src/lang/diagnostics/file_diagnostics.rs b/src/lang/diagnostics/file_diagnostics.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/diagnostics/file_diagnostics.rs
rename to src/lang/diagnostics/file_diagnostics.rs
diff --git a/crates/cairo-lang-language-server/src/lang/diagnostics/lsp.rs b/src/lang/diagnostics/lsp.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/diagnostics/lsp.rs
rename to src/lang/diagnostics/lsp.rs
diff --git a/crates/cairo-lang-language-server/src/lang/diagnostics/mod.rs b/src/lang/diagnostics/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/diagnostics/mod.rs
rename to src/lang/diagnostics/mod.rs
diff --git a/crates/cairo-lang-language-server/src/lang/diagnostics/project_diagnostics.rs b/src/lang/diagnostics/project_diagnostics.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/diagnostics/project_diagnostics.rs
rename to src/lang/diagnostics/project_diagnostics.rs
diff --git a/crates/cairo-lang-language-server/src/lang/diagnostics/refresh.rs b/src/lang/diagnostics/refresh.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/diagnostics/refresh.rs
rename to src/lang/diagnostics/refresh.rs
diff --git a/crates/cairo-lang-language-server/src/lang/diagnostics/trigger.rs b/src/lang/diagnostics/trigger.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/diagnostics/trigger.rs
rename to src/lang/diagnostics/trigger.rs
diff --git a/crates/cairo-lang-language-server/src/lang/diagnostics/trigger_test.rs b/src/lang/diagnostics/trigger_test.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/diagnostics/trigger_test.rs
rename to src/lang/diagnostics/trigger_test.rs
diff --git a/crates/cairo-lang-language-server/src/lang/inspect/crates.rs b/src/lang/inspect/crates.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/inspect/crates.rs
rename to src/lang/inspect/crates.rs
diff --git a/crates/cairo-lang-language-server/src/lang/inspect/defs.rs b/src/lang/inspect/defs.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/inspect/defs.rs
rename to src/lang/inspect/defs.rs
diff --git a/crates/cairo-lang-language-server/src/lang/inspect/methods.rs b/src/lang/inspect/methods.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/inspect/methods.rs
rename to src/lang/inspect/methods.rs
diff --git a/crates/cairo-lang-language-server/src/lang/inspect/mod.rs b/src/lang/inspect/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/inspect/mod.rs
rename to src/lang/inspect/mod.rs
diff --git a/crates/cairo-lang-language-server/src/lang/lsp/ls_proto_group.rs b/src/lang/lsp/ls_proto_group.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/lsp/ls_proto_group.rs
rename to src/lang/lsp/ls_proto_group.rs
diff --git a/crates/cairo-lang-language-server/src/lang/lsp/ls_proto_group_test.rs b/src/lang/lsp/ls_proto_group_test.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/lsp/ls_proto_group_test.rs
rename to src/lang/lsp/ls_proto_group_test.rs
diff --git a/crates/cairo-lang-language-server/src/lang/lsp/mod.rs b/src/lang/lsp/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/lsp/mod.rs
rename to src/lang/lsp/mod.rs
diff --git a/crates/cairo-lang-language-server/src/lang/lsp/to_lsp.rs b/src/lang/lsp/to_lsp.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/lsp/to_lsp.rs
rename to src/lang/lsp/to_lsp.rs
diff --git a/crates/cairo-lang-language-server/src/lang/mod.rs b/src/lang/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/mod.rs
rename to src/lang/mod.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/client/connection.rs b/src/lang/proc_macros/client/connection.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/client/connection.rs
rename to src/lang/proc_macros/client/connection.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/client/id_generator.rs b/src/lang/proc_macros/client/id_generator.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/client/id_generator.rs
rename to src/lang/proc_macros/client/id_generator.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/client/mod.rs b/src/lang/proc_macros/client/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/client/mod.rs
rename to src/lang/proc_macros/client/mod.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/client/status.rs b/src/lang/proc_macros/client/status.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/client/status.rs
rename to src/lang/proc_macros/client/status.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/controller.rs b/src/lang/proc_macros/controller.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/controller.rs
rename to src/lang/proc_macros/controller.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/db.rs b/src/lang/proc_macros/db.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/db.rs
rename to src/lang/proc_macros/db.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/mod.rs b/src/lang/proc_macros/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/mod.rs
rename to src/lang/proc_macros/mod.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/plugins/downcast.rs b/src/lang/proc_macros/plugins/downcast.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/plugins/downcast.rs
rename to src/lang/proc_macros/plugins/downcast.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/plugins/mod.rs b/src/lang/proc_macros/plugins/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/plugins/mod.rs
rename to src/lang/proc_macros/plugins/mod.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/plugins/scarb/inline.rs b/src/lang/proc_macros/plugins/scarb/inline.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/plugins/scarb/inline.rs
rename to src/lang/proc_macros/plugins/scarb/inline.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/plugins/scarb/mod.rs b/src/lang/proc_macros/plugins/scarb/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/plugins/scarb/mod.rs
rename to src/lang/proc_macros/plugins/scarb/mod.rs
diff --git a/crates/cairo-lang-language-server/src/lang/proc_macros/plugins/scarb/regular.rs b/src/lang/proc_macros/plugins/scarb/regular.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lang/proc_macros/plugins/scarb/regular.rs
rename to src/lang/proc_macros/plugins/scarb/regular.rs
diff --git a/crates/cairo-lang-language-server/src/lib.rs b/src/lib.rs
similarity index 99%
rename from crates/cairo-lang-language-server/src/lib.rs
rename to src/lib.rs
index 4590f6fa..9bfc0985 100644
--- a/crates/cairo-lang-language-server/src/lib.rs
+++ b/src/lib.rs
@@ -10,7 +10,7 @@
 //! ```no_run
 //! # #![allow(clippy::needless_doctest_main)]
 //! fn main() {
-//!     cairo_lang_language_server::start();
+//!     cairo_language_server::start();
 //! }
 //! ```
 //!
@@ -25,7 +25,7 @@
 //!
 //! ```no_run
 //! # #![allow(clippy::needless_doctest_main)]
-//! use cairo_lang_language_server::Tricks;
+//! use cairo_language_server::Tricks;
 //!
 //! # fn dojo_plugin_suite() -> cairo_lang_semantic::plugin::PluginSuite {
 //! #    // Returning something realistic, to make sure restrictive trait bounds do compile.
@@ -34,7 +34,7 @@
 //! fn main() {
 //!     let mut tricks = Tricks::default();
 //!     tricks.extra_plugin_suites = Some(&|| vec![dojo_plugin_suite()]);
-//!     cairo_lang_language_server::start_with_tricks(tricks);
+//!     cairo_language_server::start_with_tricks(tricks);
 //! }
 //! ```
 
diff --git a/crates/cairo-lang-language-server/src/lsp/capabilities/client.rs b/src/lsp/capabilities/client.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lsp/capabilities/client.rs
rename to src/lsp/capabilities/client.rs
diff --git a/crates/cairo-lang-language-server/src/lsp/capabilities/mod.rs b/src/lsp/capabilities/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lsp/capabilities/mod.rs
rename to src/lsp/capabilities/mod.rs
diff --git a/crates/cairo-lang-language-server/src/lsp/capabilities/server.rs b/src/lsp/capabilities/server.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lsp/capabilities/server.rs
rename to src/lsp/capabilities/server.rs
diff --git a/crates/cairo-lang-language-server/src/lsp/ext.rs b/src/lsp/ext.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lsp/ext.rs
rename to src/lsp/ext.rs
diff --git a/crates/cairo-lang-language-server/src/lsp/mod.rs b/src/lsp/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lsp/mod.rs
rename to src/lsp/mod.rs
diff --git a/crates/cairo-lang-language-server/src/lsp/result.rs b/src/lsp/result.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/lsp/result.rs
rename to src/lsp/result.rs
diff --git a/crates/bin/cairo-language-server/src/main.rs b/src/main.rs
similarity index 57%
rename from crates/bin/cairo-language-server/src/main.rs
rename to src/main.rs
index 91d564e3..a37c47e9 100644
--- a/crates/bin/cairo-language-server/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
 use std::process::ExitCode;
 
 fn main() -> ExitCode {
-    cairo_lang_language_server::start()
+    cairo_language_server::start()
 }
diff --git a/crates/cairo-lang-language-server/src/project/crate_data.rs b/src/project/crate_data.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/project/crate_data.rs
rename to src/project/crate_data.rs
diff --git a/crates/cairo-lang-language-server/src/project/mod.rs b/src/project/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/project/mod.rs
rename to src/project/mod.rs
diff --git a/crates/cairo-lang-language-server/src/project/project_manifest_path.rs b/src/project/project_manifest_path.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/project/project_manifest_path.rs
rename to src/project/project_manifest_path.rs
diff --git a/crates/cairo-lang-language-server/src/project/project_manifest_path_test.rs b/src/project/project_manifest_path_test.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/project/project_manifest_path_test.rs
rename to src/project/project_manifest_path_test.rs
diff --git a/crates/cairo-lang-language-server/src/project/scarb.rs b/src/project/scarb.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/project/scarb.rs
rename to src/project/scarb.rs
diff --git a/crates/cairo-lang-language-server/src/project/unmanaged_core_crate.rs b/src/project/unmanaged_core_crate.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/project/unmanaged_core_crate.rs
rename to src/project/unmanaged_core_crate.rs
diff --git a/crates/cairo-lang-language-server/src/server/client.rs b/src/server/client.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/client.rs
rename to src/server/client.rs
diff --git a/crates/cairo-lang-language-server/src/server/commands.rs b/src/server/commands.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/commands.rs
rename to src/server/commands.rs
diff --git a/crates/cairo-lang-language-server/src/server/connection.rs b/src/server/connection.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/connection.rs
rename to src/server/connection.rs
diff --git a/crates/cairo-lang-language-server/src/server/mod.rs b/src/server/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/mod.rs
rename to src/server/mod.rs
diff --git a/crates/cairo-lang-language-server/src/server/panic.rs b/src/server/panic.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/panic.rs
rename to src/server/panic.rs
diff --git a/crates/cairo-lang-language-server/src/server/routing/mod.rs b/src/server/routing/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/routing/mod.rs
rename to src/server/routing/mod.rs
diff --git a/crates/cairo-lang-language-server/src/server/routing/traits.rs b/src/server/routing/traits.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/routing/traits.rs
rename to src/server/routing/traits.rs
diff --git a/crates/cairo-lang-language-server/src/server/schedule/mod.rs b/src/server/schedule/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/schedule/mod.rs
rename to src/server/schedule/mod.rs
diff --git a/crates/cairo-lang-language-server/src/server/schedule/task.rs b/src/server/schedule/task.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/schedule/task.rs
rename to src/server/schedule/task.rs
diff --git a/crates/cairo-lang-language-server/src/server/schedule/thread/mod.rs b/src/server/schedule/thread/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/schedule/thread/mod.rs
rename to src/server/schedule/thread/mod.rs
diff --git a/crates/cairo-lang-language-server/src/server/schedule/thread/pool.rs b/src/server/schedule/thread/pool.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/schedule/thread/pool.rs
rename to src/server/schedule/thread/pool.rs
diff --git a/crates/cairo-lang-language-server/src/server/schedule/thread/priority.rs b/src/server/schedule/thread/priority.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/server/schedule/thread/priority.rs
rename to src/server/schedule/thread/priority.rs
diff --git a/crates/cairo-lang-language-server/src/state.rs b/src/state.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/state.rs
rename to src/state.rs
diff --git a/crates/cairo-lang-language-server/src/toolchain/mod.rs b/src/toolchain/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/toolchain/mod.rs
rename to src/toolchain/mod.rs
diff --git a/crates/cairo-lang-language-server/src/toolchain/scarb.rs b/src/toolchain/scarb.rs
similarity index 100%
rename from crates/cairo-lang-language-server/src/toolchain/scarb.rs
rename to src/toolchain/scarb.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/analysis.rs b/tests/e2e/analysis.rs
similarity index 99%
rename from crates/cairo-lang-language-server/tests/e2e/analysis.rs
rename to tests/e2e/analysis.rs
index 3d1ba661..6128b058 100644
--- a/crates/cairo-lang-language-server/tests/e2e/analysis.rs
+++ b/tests/e2e/analysis.rs
@@ -1,4 +1,4 @@
-use cairo_lang_language_server::lsp;
+use cairo_language_server::lsp;
 use indoc::indoc;
 use lsp_types::{ExecuteCommandParams, lsp_request};
 use pretty_assertions::assert_eq;
diff --git a/crates/cairo-lang-language-server/tests/e2e/code_actions.rs b/tests/e2e/code_actions.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/code_actions.rs
rename to tests/e2e/code_actions.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/completions.rs b/tests/e2e/completions.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/completions.rs
rename to tests/e2e/completions.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/goto.rs b/tests/e2e/goto.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/goto.rs
rename to tests/e2e/goto.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/hover.rs b/tests/e2e/hover.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/hover.rs
rename to tests/e2e/hover.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/macro_expand.rs b/tests/e2e/macro_expand.rs
similarity index 97%
rename from crates/cairo-lang-language-server/tests/e2e/macro_expand.rs
rename to tests/e2e/macro_expand.rs
index 78dcd472..7790b669 100644
--- a/crates/cairo-lang-language-server/tests/e2e/macro_expand.rs
+++ b/tests/e2e/macro_expand.rs
@@ -1,6 +1,6 @@
-use cairo_lang_language_server::lsp::ext::ExpandMacro;
 use cairo_lang_test_utils::parse_test_file::TestRunnerResult;
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
+use cairo_language_server::lsp::ext::ExpandMacro;
 use lsp_types::{TextDocumentIdentifier, TextDocumentPositionParams};
 
 use crate::support::cursor::peek_caret;
diff --git a/crates/cairo-lang-language-server/tests/e2e/main.rs b/tests/e2e/main.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/main.rs
rename to tests/e2e/main.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/semantic_tokens.rs b/tests/e2e/semantic_tokens.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/semantic_tokens.rs
rename to tests/e2e/semantic_tokens.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/support/client_capabilities.rs b/tests/e2e/support/client_capabilities.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/support/client_capabilities.rs
rename to tests/e2e/support/client_capabilities.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/support/cursor.rs b/tests/e2e/support/cursor.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/support/cursor.rs
rename to tests/e2e/support/cursor.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/support/cursor_test.rs b/tests/e2e/support/cursor_test.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/support/cursor_test.rs
rename to tests/e2e/support/cursor_test.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/support/fixture.rs b/tests/e2e/support/fixture.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/support/fixture.rs
rename to tests/e2e/support/fixture.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/support/jsonrpc.rs b/tests/e2e/support/jsonrpc.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/support/jsonrpc.rs
rename to tests/e2e/support/jsonrpc.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/support/mock_client.rs b/tests/e2e/support/mock_client.rs
similarity index 99%
rename from crates/cairo-lang-language-server/tests/e2e/support/mock_client.rs
rename to tests/e2e/support/mock_client.rs
index 130075f4..8c1f93e0 100644
--- a/crates/cairo-lang-language-server/tests/e2e/support/mock_client.rs
+++ b/tests/e2e/support/mock_client.rs
@@ -4,7 +4,7 @@ use std::path::Path;
 use std::time::Duration;
 use std::{fmt, mem, process};
 
-use cairo_lang_language_server::build_service_for_e2e_tests;
+use cairo_language_server::build_service_for_e2e_tests;
 use lsp_server::{Message, Notification, Request, Response};
 use lsp_types::request::{RegisterCapability, Request as LspRequest};
 use lsp_types::{lsp_notification, lsp_request};
diff --git a/crates/cairo-lang-language-server/tests/e2e/support/mod.rs b/tests/e2e/support/mod.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/support/mod.rs
rename to tests/e2e/support/mod.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/support/normalize.rs b/tests/e2e/support/normalize.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/support/normalize.rs
rename to tests/e2e/support/normalize.rs
diff --git a/crates/cairo-lang-language-server/tests/e2e/workspace_configuration.rs b/tests/e2e/workspace_configuration.rs
similarity index 100%
rename from crates/cairo-lang-language-server/tests/e2e/workspace_configuration.rs
rename to tests/e2e/workspace_configuration.rs
diff --git a/crates/cairo-lang-language-server/tests/test_data/code_actions/fill_struct_fields.txt b/tests/test_data/code_actions/fill_struct_fields.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/code_actions/fill_struct_fields.txt
rename to tests/test_data/code_actions/fill_struct_fields.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/code_actions/macro_expand.txt b/tests/test_data/code_actions/macro_expand.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/code_actions/macro_expand.txt
rename to tests/test_data/code_actions/macro_expand.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/code_actions/missing_trait.txt b/tests/test_data/code_actions/missing_trait.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/code_actions/missing_trait.txt
rename to tests/test_data/code_actions/missing_trait.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/completions/methods_text_edits.txt b/tests/test_data/completions/methods_text_edits.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/completions/methods_text_edits.txt
rename to tests/test_data/completions/methods_text_edits.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/completions/module_items.txt b/tests/test_data/completions/module_items.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/completions/module_items.txt
rename to tests/test_data/completions/module_items.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/completions/structs.txt b/tests/test_data/completions/structs.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/completions/structs.txt
rename to tests/test_data/completions/structs.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/goto/struct_members.txt b/tests/test_data/goto/struct_members.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/goto/struct_members.txt
rename to tests/test_data/goto/struct_members.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/hover/basic.txt b/tests/test_data/hover/basic.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/hover/basic.txt
rename to tests/test_data/hover/basic.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/hover/literals.txt b/tests/test_data/hover/literals.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/hover/literals.txt
rename to tests/test_data/hover/literals.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/hover/missing_module.txt b/tests/test_data/hover/missing_module.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/hover/missing_module.txt
rename to tests/test_data/hover/missing_module.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/hover/partial.txt b/tests/test_data/hover/partial.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/hover/partial.txt
rename to tests/test_data/hover/partial.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/hover/paths.txt b/tests/test_data/hover/paths.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/hover/paths.txt
rename to tests/test_data/hover/paths.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/hover/starknet.txt b/tests/test_data/hover/starknet.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/hover/starknet.txt
rename to tests/test_data/hover/starknet.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/hover/structs.txt b/tests/test_data/hover/structs.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/hover/structs.txt
rename to tests/test_data/hover/structs.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/macro_expand/attribute.txt b/tests/test_data/macro_expand/attribute.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/macro_expand/attribute.txt
rename to tests/test_data/macro_expand/attribute.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/macro_expand/derive.txt b/tests/test_data/macro_expand/derive.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/macro_expand/derive.txt
rename to tests/test_data/macro_expand/derive.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/macro_expand/empty.txt b/tests/test_data/macro_expand/empty.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/macro_expand/empty.txt
rename to tests/test_data/macro_expand/empty.txt
diff --git a/crates/cairo-lang-language-server/tests/test_data/macro_expand/simple_inline.txt b/tests/test_data/macro_expand/simple_inline.txt
similarity index 100%
rename from crates/cairo-lang-language-server/tests/test_data/macro_expand/simple_inline.txt
rename to tests/test_data/macro_expand/simple_inline.txt

From f59b7816ee60bcf0e20b2bf8cdfc6c6f997de5ee Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 10:57:42 +0100
Subject: [PATCH 10/23] Update CODEOWNERS

---
 .github/CODEOWNERS | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5055b7be..17aff61b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1 @@
-/crates/cairo-lang-doc @orizi @mkaput @Arcticae @Draggu @piotmag769 @integraledelebesgue
-/crates/cairo-lang-language-server @orizi @mkaput @Arcticae @Draggu @piotmag769 @integraledelebesgue
-/vscode-cairo @orizi @mkaput @Arcticae @Draggu @piotmag769 @integraledelebesgue
+* @software-mansion/cairo-ls

From eca22dc0e410fa7eeecefde21153708368f46a99 Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 10:58:55 +0100
Subject: [PATCH 11/23] Use our issue templates

---
 .github/ISSUE_TEMPLATE/01_BUG_REPORT.md       | 37 ---------------
 .github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md  | 35 ---------------
 .../ISSUE_TEMPLATE/03_CODEBASE_IMPROVEMENT.md |  7 ---
 .github/ISSUE_TEMPLATE/bug_report.yml         | 45 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml             |  8 ++--
 .github/ISSUE_TEMPLATE/feature_request.yml    | 35 +++++++++++++++
 6 files changed, 83 insertions(+), 84 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/01_BUG_REPORT.md
 delete mode 100644 .github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md
 delete mode 100644 .github/ISSUE_TEMPLATE/03_CODEBASE_IMPROVEMENT.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/01_BUG_REPORT.md b/.github/ISSUE_TEMPLATE/01_BUG_REPORT.md
deleted file mode 100644
index 9a0bfdf0..00000000
--- a/.github/ISSUE_TEMPLATE/01_BUG_REPORT.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-name: Bug Report
-about: Create a report to help Cairo to improve
-title: "bug: "
-labels: "bug"
-assignees: ""
----
-
-# Bug Report
-
-**Cairo version:**
-
-<!-- Please specify commit or tag version. -->
-
-**Current behavior:**
-
-<!-- Describe how the bug manifests. -->
-
-**Expected behavior:**
-
-<!-- Describe what you expect the behavior to be without the bug. -->
-
-**Steps to reproduce:**
-
-<!-- Explain the steps required to duplicate the issue, especially if you are able to provide a sample application. -->
-
-**Related code:**
-
-<!-- If you are able to illustrate the bug or feature request with an example, please provide it here. -->
-
-```
-insert short code snippets here
-```
-
-**Other information:**
-
-<!-- List any other information that is relevant to your issue. Related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->
diff --git a/.github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md
deleted file mode 100644
index 57191479..00000000
--- a/.github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for this project
-title: "feat: "
-labels: "enhancement"
-assignees: ""
----
-
-# Feature Request
-
-**Describe the Feature Request**
-
-<!-- A clear and concise description of what the feature request is. Please include if your feature request is related to a problem. -->
-
-**Describe Preferred Solution**
-
-<!-- A clear and concise description of what you want to happen. -->
-
-**Describe Alternatives**
-
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-
-**Related Code**
-
-<!-- If you are able to illustrate the bug or feature request with an example, please provide it here. -->
-
-**Additional Context**
-
-<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to add, use case, Stack Overflow links, forum links, screenshots, OS if applicable, etc. -->
-
-**If the feature request is approved, would you be willing to submit a PR?**
-_(Help can be provided if you need assistance submitting a PR)_
-
-- [ ] Yes
-- [ ] No
diff --git a/.github/ISSUE_TEMPLATE/03_CODEBASE_IMPROVEMENT.md b/.github/ISSUE_TEMPLATE/03_CODEBASE_IMPROVEMENT.md
deleted file mode 100644
index bcd6cb77..00000000
--- a/.github/ISSUE_TEMPLATE/03_CODEBASE_IMPROVEMENT.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Codebase improvement
-about: Provide your feedback for the existing codebase. Suggest a better solution for algorithms, development tools, etc.
-title: "dev: "
-labels: "enhancement"
-assignees: ""
----
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 00000000..0eea4062
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,45 @@
+name: Bug Report
+description: Create a report to help us improve
+labels: [ "bug" ]
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for filing a 🐛 bug report 😄!
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem
+      description: >
+        Please provide a clear and concise description of what the bug is,
+        including what currently happens and what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps
+      description: Please list the steps to reproduce the bug.
+      placeholder: |
+        1.
+        2.
+        3.
+  - type: textarea
+    id: possible-solutions
+    attributes:
+      label: Possible Solution(s)
+      description: >
+        Not obligatory, but suggest a fix/reason for the bug,
+        or ideas how to implement the addition or change.
+  - type: textarea
+    id: notes
+    attributes:
+      label: Notes
+      description: Provide any additional notes that might be helpful.
+  - type: textarea
+    id: scarb-version
+    attributes:
+      label: Scarb Version
+      description: >
+        Please paste the output of running `scarb --version`.
+        Remember to do this in the affected project directory.
+      render: text
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 7d5bd899..507b8088 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,4 @@
----
-blank_issues_enabled: false
 contact_links:
-  - name: Cairo Community Support
-    url: https://github.com/starkware-libs/cairo/discussions
-    about: Please ask and answer questions here.
+  - name: Cairo Language Server Telegram Channel
+    url: https://t.me/cairo_ls_support
+    about: Have a question or issue? Chat with the community and developers here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000..cab4ac65
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,35 @@
+name: Feature Request
+description: Suggest an idea for enhancing CairoLS
+labels: [ "enhancement" ]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for filing a 🙋 feature request! 😄
+
+        If the feature request is relatively small and already with a possible solution, this might be the place for you.
+
+        If you are brewing a big feature that needs feedback from the community, [the CairoLS Telegram channel][tg] is the best fit.
+        You can also talk the idea over with other developers over there.
+
+        [tg]: https://t.me/cairo_ls_support
+  - type: textarea
+    id: problem
+    attributes:
+      label: Problem
+      description: >
+        Please provide a clear description of your use case and the problem
+        this feature request is trying to solve.
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed Solution
+      description: >
+        Please provide a clear and concise description of what you want to happen.
+  - type: textarea
+    id: notes
+    attributes:
+      label: Notes
+      description: Provide any additional context or information that might be helpful.

From f20939cda0f683cfd4e72c9b8f9dbaf5f3b1ac46 Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 11:01:05 +0100
Subject: [PATCH 12/23] Add SECURITY.md

---
 SECURITY.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000..d9d2b869
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,20 @@
+# Security Policy
+
+## Supported Versions
+
+Only the latest release is supported with security updates.
+
+## Reporting a Vulnerability
+
+If there are any vulnerabilities in **Cairo extension for Visual Studio Code**, don't hesitate to
+_report them_.
+
+1. If you found a vulnerability in **Cairo language/compiler**, please consult its
+   own [security policy](https://github.com/starkware-libs/cairo/security/policy).
+2. If you found a vulnerability in **Cairo extension for Visual Studio Code**, please consult its
+   own [security policy](https://github.com/software-mansion/vscode-cairo/blob/main/SECURITY.md).
+3. Use the GitHub Security site for reporting vulnerabilities. You can report
+   one [here](https://github.com/software-mansion/cairols/security/advisories/new).
+4. Please **do not disclose the vulnerability publicly** until a fix is released!
+5. Once we have either a) published a fix or b) declined to address the vulnerability for whatever
+   reason, you are free to publicly disclose it.

From 7ecdf7d43221c41b784277577385944756c5b432 Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 11:02:47 +0100
Subject: [PATCH 13/23] Remove unused CI workflows

---
 .github/workflows/artifacts.yml        | 19 --------
 .github/workflows/nightly.yml          | 67 --------------------------
 .github/workflows/release.yaml         | 40 ---------------
 .github/workflows/tree-sitter.yml      | 41 ----------------
 .github/workflows/vscode-cairo-ci.yaml | 32 ------------
 5 files changed, 199 deletions(-)
 delete mode 100644 .github/workflows/artifacts.yml
 delete mode 100644 .github/workflows/nightly.yml
 delete mode 100644 .github/workflows/release.yaml
 delete mode 100644 .github/workflows/tree-sitter.yml
 delete mode 100644 .github/workflows/vscode-cairo-ci.yaml

diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
deleted file mode 100644
index 83279ba6..00000000
--- a/.github/workflows/artifacts.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Crate Artifacts
-on: workflow_dispatch
-jobs:
-  create_artifacts:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-      - name: Install musl tools.
-        run: sudo apt-get install -y musl-tools
-      - name: Build in unknown linux
-        run: ./scripts/release_tar.sh x86_64-unknown-linux-musl
-      - name: Archive artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: release-x86_64-unknown-linux-musl
-          path: target/x86_64-unknown-linux-musl.tar.gz
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
deleted file mode 100644
index 7929cd0b..00000000
--- a/.github/workflows/nightly.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-name: Nightly
-
-on:
-  schedule:
-    # Runs the end of every day.
-    - cron: "0 0 * * *"
-
-env:
-  RUSTUP_TOOLCHAIN: nightly
-
-jobs:
-  rustfmt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
-        with:
-          components: rustfmt
-      - uses: Swatinem/rust-cache@v2
-      - run: scripts/rust_fmt.sh --check
-
-  clippy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
-        with:
-          components: clippy
-      - uses: Swatinem/rust-cache@v2
-      - run: >
-          scripts/clippy.sh
-
-  docs:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
-      - uses: Swatinem/rust-cache@v2
-      - run: >
-          scripts/docs.sh
-
-  typos:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: crate-ci/typos@master
-
-  starknet_sierra_validate:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
-      - uses: Swatinem/rust-cache@v2
-      - run: >
-          scripts/starknet_sierra_validate.sh https://papyrus-integration-mainnet.sw-dev.io/rpc/v0_7
-      - run: >
-          scripts/starknet_sierra_validate.sh https://papyrus-integration-sepolia-testnet.sw-dev.io/rpc/v0_7
-
-  vscode-cairo-check-cairo-snippets:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '22.x'
-      - run: >
-          scripts/vscode-cairo-check-cairo-snippets.sh
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
deleted file mode 100644
index c2bd35de..00000000
--- a/.github/workflows/release.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: release
-on:
-  push:
-    tags:
-      - "v*"
-
-jobs:
-  release:
-    name: Publish for ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            artifact_name: x86_64-unknown-linux-musl.tar.gz
-            asset_name: release-x86_64-unknown-linux-musl.tar.gz
-            target: x86_64-unknown-linux-musl
-          - os: macos-latest
-            artifact_name: aarch64-apple-darwin.tar.gz
-            asset_name: release-aarch64-apple-darwin.tar
-            target: aarch64-apple-darwin
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install musl
-        run: |
-          if [ "${{ matrix.target }}" == "x86_64-unknown-linux-musl" ]
-          then
-            sudo apt-get install -y musl-tools
-          fi
-      - name: Build in ${{ matrix.target }}
-        run: ./scripts/release_tar.sh ${{ matrix.target }}
-      - name: Upload binaries to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: target/${{ matrix.artifact_name }}
-          asset_name: ${{ matrix.asset_name }}
-          tag: ${{ github.ref }}
-          overwrite: true
-          body: "Cairo compiler."
diff --git a/.github/workflows/tree-sitter.yml b/.github/workflows/tree-sitter.yml
deleted file mode 100644
index 52bc330f..00000000
--- a/.github/workflows/tree-sitter.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Tree sitter
-on:
-  schedule:
-    - cron: "0 0 * * *"
-
-jobs:
-  test:
-    name: Test tree-sitter parser
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Set up tree-sitter
-        uses: tree-sitter/setup-action/cli@v1
-      - name: Clone tree-sitter-repo
-        run: |-
-          git clone https://github.com/starkware-libs/tree-sitter-cairo --single-branch --depth=1 --filter=blob:none
-          mv tree-sitter-cairo/** .
-      - name: Parse examples
-        uses: tree-sitter/parse-action@v4
-        with:
-          files: ./**/*.cairo
-          invalid-files: crates/cairo-lang-parser/src/parser_test_data/cairo_test_files/*.cairo
-
-  notify_failed:
-    runs-on: ubuntu-latest
-    # Do not run on dry_run or success
-    if: always() && !(inputs.dry_run) && contains(needs.*.result, 'failure')
-    needs: [ test ]
-    steps:
-      - name: Notifying about Nightly fail!
-        uses: slackapi/slack-github-action@v1.26.0
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TREE_SITTER_FAILURE_WEBHOOK }}
-        with:
-          payload: |
-            {
-              "url": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-            }
diff --git a/.github/workflows/vscode-cairo-ci.yaml b/.github/workflows/vscode-cairo-ci.yaml
deleted file mode 100644
index 102c45a7..00000000
--- a/.github/workflows/vscode-cairo-ci.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: VSCode Cairo Extension CI
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'vscode-cairo/**'
-  pull_request:
-    paths:
-      - 'vscode-cairo/**'
-  merge_group:
-
-jobs:
-  fmt-and-lint:
-    name: format and lint
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./vscode-cairo
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '22.x'
-          cache: npm
-          cache-dependency-path: vscode-cairo/package-lock.json
-      - run: npm ci
-      - run: npm run lint-fmt
-      - run: npm run lint-eslint
-      - run: npm run compile-test
-      - run: npm run test

From 1c260e42353780f728ea3f37ae942c73ed9ff786 Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 11:18:58 +0100
Subject: [PATCH 14/23] Update CI workflow

---
 .github/workflows/ci.yml | 185 ++++++++++-----------------------------
 1 file changed, 46 insertions(+), 139 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 930f6c8e..40973fde 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,170 +2,77 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
   pull_request:
   merge_group:
-    types: [ checks_requested ]
 
 jobs:
-  ensure-no_std:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: nightly-2024-11-23
-          targets: wasm32-unknown-unknown
-      - uses: Swatinem/rust-cache@v2
-      - run: |
-          cd ensure-no_std && cargo build
-
-  parallel-tests:
-    runs-on: ubuntu-latest
+  build-test:
+    name: build test ${{ matrix.platform.name }}
+    runs-on: ${{ matrix.platform.os }}
     strategy:
+      fail-fast: false
       matrix:
-        cmd:
-          - test --profile=ci -p cairo-lang-casm --features=serde,parity-scale-codec,schemars
-          - test --profile=ci -p cairo-lang-casm --no-default-features --features=serde,parity-scale-codec
-          - test --profile=ci -p cairo-lang-compiler
-          - test --profile=ci -p cairo-lang-debug
-          - test --profile=ci -p cairo-lang-defs
-          - test --profile=ci -p cairo-lang-diagnostics
-          - test --profile=ci -p cairo-lang-doc
-          - test --profile=ci -p cairo-lang-eq-solver
-          - test --profile=ci -p cairo-lang-filesystem
-          - test --profile=ci -p cairo-lang-formatter
-          - test --profile=ci -p cairo-lang-language-server
-          - test --profile=ci -p cairo-lang-lowering
-          - test --profile=ci -p cairo-lang-parser
-          - test --profile=ci -p cairo-lang-plugins
-          - test --profile=ci -p cairo-lang-proc-macros
-          - test --profile=ci -p cairo-lang-project
-          - test --profile=ci -p cairo-lang-runnable
-          - test --profile=ci -p cairo-lang-runnable-utils
-          - test --profile=ci -p cairo-lang-runner
-          - test --profile=ci -p cairo-lang-semantic
-          - test --profile=ci -p cairo-lang-sierra
-          - test --profile=ci -p cairo-lang-sierra-ap-change
-          - test --profile=ci -p cairo-lang-sierra-gas
-          - test --profile=ci -p cairo-lang-sierra-generator
-          - test --profile=ci -p cairo-lang-sierra-to-casm
-          - test --profile=ci -p cairo-lang-sierra-type-size
-          - test --profile=ci -p cairo-lang-starknet-classes
-          - test --profile=ci -p cairo-lang-starknet
-          - test --profile=ci -p cairo-lang-syntax
-          - test --profile=ci -p cairo-lang-syntax-codegen
-          - test --profile=ci -p cairo-lang-test-plugin
-          - test --profile=ci -p cairo-lang-test-runner
-          - test --profile=ci -p cairo-lang-test-utils
-          - test --profile=ci -p cairo-lang-utils --features=serde,parity-scale-codec,schemars,testing,env_logger
-          - test --profile=ci -p cairo-lang-utils --no-default-features --features=serde,parity-scale-codec
-          - test --profile=ci -p tests
+        platform:
+          - name: linux x86-64
+            os: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          components: rustfmt
-          toolchain: nightly-2024-11-23
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
-      - name: Install nextest
-        uses: taiki-e/install-action@nextest
-      # Validates that the number of commands in the matrix is equal to the number of crates in the
-      # workspace + 2 (for the crates which have multiple commands)
-      - run: |
-          CRATES_COUNT=$(find {crates/*,tests}/Cargo.toml | wc -l)
-          COMMANDS_COUNT=${{ strategy.job-total }}
-          if [ $((CRATES_COUNT + 2)) -ne $COMMANDS_COUNT ]; then
-            echo "CRATES_COUNT: $CRATES_COUNT"
-            echo "COMMANDS_COUNT: $COMMANDS_COUNT"
-            echo "The number of commands in the matrix is not equal to the number of crates in the workspace + 2"
-            exit 1
-          fi
-      - run: |
-          cargo ${{ matrix.cmd }}
-  test:
-    if: ${{ always() }}
-    needs: parallel-tests
-    runs-on: ubuntu-latest
-    steps:
-      - if: needs.parallel-tests.result == 'success'
-        run: exit 0
-      - if: needs.parallel-tests.result != 'success'
-        run: exit 1
-  rustfmt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@master
+      - uses: taiki-e/install-action@nextest
+      - name: nextest archive
+        run: cargo nextest archive --workspace --all-features --cargo-profile ci --archive-file 'nextest-archive-${{ matrix.platform.os }}.tar.zst'
+      - uses: actions/upload-artifact@v4
         with:
-          components: rustfmt
-          toolchain: nightly-2024-11-23
-      - uses: Swatinem/rust-cache@v2
-      - run: scripts/rust_fmt.sh --check
+          name: nextest-archive-${{ matrix.platform.os }}
+          path: nextest-archive-${{ matrix.platform.os }}.tar.zst
 
-  # Checks all .cairo files in the repo are formatted correctly.
-  cairofmt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-      - run: scripts/cairo_fmt.sh --check
-
-  # Checks all cairo corelib tests run correctly.
-  cairotest:
-    runs-on: ubuntu-latest
+  test:
+    name: test ${{ matrix.platform.name }} ${{ matrix.partition }}/8
+    runs-on: ${{ matrix.platform.os }}
+    needs:
+      - build-test
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - name: linux x86-64
+            os: ubuntu-latest
+        partition: [ 1, 2, 3, 4, 5, 6, 7, 8 ]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-      - run: scripts/cairo_test.sh
-      - run: scripts/starknet_test.sh
-
-  # Check for unnecessary dependencies.
-  udeps:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Machete
-        uses: bnjbvr/cargo-machete@main
-
-  clippy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@master
+      - uses: taiki-e/install-action@nextest
+      - uses: actions/download-artifact@v4
         with:
-          components: clippy
-          toolchain: nightly-2024-11-23
-      - uses: Swatinem/rust-cache@v2
-      - run: >
-          scripts/clippy.sh
+          name: nextest-archive-${{ matrix.platform.os }}
+      - name: nextest partition ${{ matrix.partition }}/8
+        run: cargo nextest run --partition 'count:${{ matrix.partition }}/8' --archive-file 'nextest-archive-${{ matrix.platform.os }}.tar.zst'
 
-  typos:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: crate-ci/typos@v1.27.0
-
-  docs:
+  check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: nightly-2024-11-23
+          components: rustfmt
+      - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
-      - run: >
-          scripts/docs.sh
+      - run: cargo +nightly-2024-11-23 fmt --check
+      - run: cargo clippy --all-targets --all-features -- --no-deps
+        env:
+          # Make sure CI fails on all warnings, including Clippy lints.
+          RUSTFLAGS: "-Dwarnings"
+      - run: cargo doc --all-features --no-deps
+        env:
+          # Make sure CI fails on all warnings, including Clippy lints.
+          RUSTDOCFLAGS: "-Dwarnings"
 
-  sierra-updated-check:
+  udeps:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          fetch-depth: '0'
-      - run: >
-          scripts/sierra_update_check.sh origin/$GITHUB_BASE_REF origin/$GITHUB_HEAD_REF
+      - uses: bnjbvr/cargo-machete@main

From 5ab3376e9faaa828b372bf7a55f37f4e98f88732 Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 11:21:33 +0100
Subject: [PATCH 15/23] Delete `scripts/`

---
 scripts/cairo_fmt.sh  | 3 ---
 scripts/cairo_test.sh | 4 ----
 scripts/clippy.sh     | 6 ------
 scripts/docs.sh       | 5 -----
 scripts/rust_fmt.sh   | 5 -----
 5 files changed, 23 deletions(-)
 delete mode 100755 scripts/cairo_fmt.sh
 delete mode 100755 scripts/cairo_test.sh
 delete mode 100755 scripts/clippy.sh
 delete mode 100755 scripts/docs.sh
 delete mode 100755 scripts/rust_fmt.sh

diff --git a/scripts/cairo_fmt.sh b/scripts/cairo_fmt.sh
deleted file mode 100755
index 0be5792c..00000000
--- a/scripts/cairo_fmt.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cargo run --profile=ci --bin cairo-format -- --recursive "$@"
diff --git a/scripts/cairo_test.sh b/scripts/cairo_test.sh
deleted file mode 100755
index 9688457c..00000000
--- a/scripts/cairo_test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cargo run --profile=ci --bin cairo-test -- corelib/ &&
-    cargo run --profile=ci --bin cairo-test -- tests/bug_samples/ --starknet
diff --git a/scripts/clippy.sh b/scripts/clippy.sh
deleted file mode 100755
index 51b0c206..00000000
--- a/scripts/clippy.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-export RUSTUP_TOOLCHAIN="${RUSTUP_TOOLCHAIN:-nightly-2024-11-23}"
-
-cargo clippy "$@" --all-targets --all-features -- -D warnings -D future-incompatible \
-    -D nonstandard-style -D rust-2018-idioms -D unused
diff --git a/scripts/docs.sh b/scripts/docs.sh
deleted file mode 100755
index 662a265b..00000000
--- a/scripts/docs.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export RUSTUP_TOOLCHAIN="${RUSTUP_TOOLCHAIN:-nightly-2024-11-23}"
-
-RUSTDOCFLAGS="-Dwarnings" cargo doc --document-private-items --no-deps --all-features
diff --git a/scripts/rust_fmt.sh b/scripts/rust_fmt.sh
deleted file mode 100755
index fbe7cb0f..00000000
--- a/scripts/rust_fmt.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export RUSTUP_TOOLCHAIN="${RUSTUP_TOOLCHAIN:-nightly-2024-11-23}"
-
-cargo fmt --all -- "$@"

From a6835e215f7de84f722ffc37ed811570d787237c Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 11:25:33 +0100
Subject: [PATCH 16/23] Regenerate Cargo.lock

---
 Cargo.lock | 715 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 467 insertions(+), 248 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8c11ad37..495f4036 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,9 +25,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9"
 
 [[package]]
 name = "anstream"
@@ -46,9 +46,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
@@ -80,15 +80,15 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "ascii-canvas"
@@ -122,9 +122,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bit-set"
@@ -176,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
+checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22"
 dependencies = [
  "memchr",
  "serde",
@@ -204,7 +204,7 @@ dependencies = [
  "cairo-lang-utils",
  "indoc",
  "num-bigint",
- "num-traits 0.2.19",
+ "num-traits",
  "parity-scale-codec",
  "serde",
 ]
@@ -351,7 +351,7 @@ dependencies = [
  "log",
  "num-bigint",
  "num-integer",
- "num-traits 0.2.19",
+ "num-traits",
  "rust-analyzer-salsa",
  "smol_str",
 ]
@@ -376,7 +376,7 @@ checksum = "e32e958decd95ae122ee64daa26721da2f76e83231047f947fd9cdc5d3c90cc6"
 dependencies = [
  "quote",
  "scarb-stable-hash",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -398,7 +398,7 @@ dependencies = [
  "colored",
  "itertools 0.12.1",
  "num-bigint",
- "num-traits 0.2.19",
+ "num-traits",
  "rust-analyzer-salsa",
  "smol_str",
  "unescaper",
@@ -429,7 +429,7 @@ source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93
 dependencies = [
  "cairo-lang-debug",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -463,7 +463,7 @@ dependencies = [
  "indoc",
  "itertools 0.12.1",
  "num-bigint",
- "num-traits 0.2.19",
+ "num-traits",
  "rust-analyzer-salsa",
  "smol_str",
  "toml",
@@ -484,7 +484,7 @@ dependencies = [
  "lalrpop-util",
  "num-bigint",
  "num-integer",
- "num-traits 0.2.19",
+ "num-traits",
  "regex",
  "rust-analyzer-salsa",
  "serde",
@@ -506,7 +506,7 @@ dependencies = [
  "cairo-lang-utils",
  "itertools 0.12.1",
  "num-bigint",
- "num-traits 0.2.19",
+ "num-traits",
  "thiserror",
 ]
 
@@ -521,7 +521,7 @@ dependencies = [
  "cairo-lang-utils",
  "itertools 0.12.1",
  "num-bigint",
- "num-traits 0.2.19",
+ "num-traits",
  "thiserror",
 ]
 
@@ -541,7 +541,7 @@ dependencies = [
  "cairo-lang-syntax",
  "cairo-lang-utils",
  "itertools 0.12.1",
- "num-traits 0.2.19",
+ "num-traits",
  "rust-analyzer-salsa",
  "serde",
  "serde_json",
@@ -563,7 +563,7 @@ dependencies = [
  "indoc",
  "itertools 0.12.1",
  "num-bigint",
- "num-traits 0.2.19",
+ "num-traits",
  "starknet-types-core",
  "thiserror",
 ]
@@ -619,7 +619,7 @@ dependencies = [
  "itertools 0.12.1",
  "num-bigint",
  "num-integer",
- "num-traits 0.2.19",
+ "num-traits",
  "serde",
  "serde_json",
  "sha3",
@@ -637,7 +637,7 @@ dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-utils",
  "num-bigint",
- "num-traits 0.2.19",
+ "num-traits",
  "rust-analyzer-salsa",
  "smol_str",
  "unescaper",
@@ -673,7 +673,7 @@ dependencies = [
  "indoc",
  "itertools 0.12.1",
  "num-bigint",
- "num-traits 0.2.19",
+ "num-traits",
  "serde",
  "starknet-types-core",
 ]
@@ -696,10 +696,10 @@ version = "2.8.5"
 source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
 dependencies = [
  "hashbrown 0.14.5",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
  "itertools 0.12.1",
  "num-bigint",
- "num-traits 0.2.19",
+ "num-traits",
  "schemars",
  "serde",
 ]
@@ -756,9 +756,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.7"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
 dependencies = [
  "serde",
 ]
@@ -793,18 +793,18 @@ checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
 
 [[package]]
 name = "const_format"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.32"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -822,9 +822,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
@@ -970,6 +970,17 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+]
+
 [[package]]
 name = "doc-comment"
 version = "0.3.3"
@@ -1036,9 +1047,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "fixedbitset"
@@ -1107,9 +1118,9 @@ dependencies = [
 
 [[package]]
 name = "genco"
-version = "0.17.9"
+version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afac3cbb14db69ac9fef9cdb60d8a87e39a7a527f85a81a923436efa40ad42c6"
+checksum = "a35958104272e516c2a5f66a9d82fba4784d2b585fc1e2358b8f96e15d342995"
 dependencies = [
  "genco-macros",
  "relative-path",
@@ -1118,13 +1129,13 @@ dependencies = [
 
 [[package]]
 name = "genco-macros"
-version = "0.17.9"
+version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "553630feadf7b76442b0849fd25fdf89b860d933623aec9693fed19af0400c78"
+checksum = "43eaff6bbc0b3a878361aced5ec6a2818ee7c541c5b33b5880dfa9a86c23e9e7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -1159,14 +1170,14 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
 
@@ -1183,12 +1194,12 @@ dependencies = [
 
 [[package]]
 name = "good_lp"
-version = "1.8.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3198bd13dea84c76a64621d6ee8ee26a4960a9a0d538eca95ca8f1320a469ac9"
+checksum = "97630e1e456d7081c524488a87d8f8f7ed0fd3100ba10c55e3cfa7add5ce05c6"
 dependencies = [
  "fnv",
- "minilp",
+ "microlp",
 ]
 
 [[package]]
@@ -1227,12 +1238,136 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+]
+
 [[package]]
 name = "id-arena"
 version = "2.2.1"
@@ -1241,25 +1376,36 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "ignore"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
+checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
 dependencies = [
  "crossbeam-deque",
  "globset",
  "log",
  "memchr",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.9",
  "same-file",
  "walkdir",
  "winapi-util",
@@ -1267,13 +1413,13 @@ dependencies = [
 
 [[package]]
 name = "impl-trait-for-tuples"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -1295,12 +1441,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.3.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
@@ -1336,9 +1482,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jod-thread"
@@ -1348,9 +1494,9 @@ checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1392,14 +1538,14 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
- "regex-automata 0.4.8",
+ "regex-automata 0.4.9",
 ]
 
 [[package]]
 name = "lambdaworks-crypto"
-version = "0.7.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fb5d4f22241504f7c7b8d2c3a7d7835d7c07117f10bff2a7d96a9ef6ef217c3"
+checksum = "bbc2a4da0d9e52ccfe6306801a112e81a8fc0c76aa3e4449fefeda7fef72bb34"
 dependencies = [
  "lambdaworks-math",
  "serde",
@@ -1409,9 +1555,9 @@ dependencies = [
 
 [[package]]
 name = "lambdaworks-math"
-version = "0.7.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "358e172628e713b80a530a59654154bfc45783a6ed70ea284839800cebdf8f97"
+checksum = "d1bd2632acbd9957afc5aeec07ad39f078ae38656654043bf16e046fa2730e23"
 dependencies = [
  "serde",
  "serde_json",
@@ -1425,9 +1571,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.166"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36"
 
 [[package]]
 name = "libredox"
@@ -1456,7 +1602,7 @@ checksum = "edbe595006d355eaf9ae11db92707d4338cd2384d16866131cc1afdbdd35d8d9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -1465,6 +1611,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1517,10 +1669,11 @@ dependencies = [
 
 [[package]]
 name = "matrixmultiply"
-version = "0.2.4"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1"
+checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a"
 dependencies = [
+ "autocfg",
  "rawpointer",
 ]
 
@@ -1531,10 +1684,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
-name = "minilp"
-version = "0.2.2"
+name = "microlp"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a7750a9e5076c660b7bec5e6457b4dbff402b9863c8d112891434e18fd5385"
+checksum = "53e0c5664f9959f1c3970d523a22f0319024282cb754358c2afc7e1d45280ae3"
 dependencies = [
  "log",
  "sprs",
@@ -1542,14 +1695,16 @@ dependencies = [
 
 [[package]]
 name = "ndarray"
-version = "0.13.1"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac06db03ec2f46ee0ecdca1a1c34a99c0d188a0d83439b84bf0cb4b386e4ab09"
+checksum = "882ed72dce9365842bf196bdeedf5055305f11fc8c03dee7bb0194a6cad34841"
 dependencies = [
  "matrixmultiply",
  "num-complex",
  "num-integer",
- "num-traits 0.2.19",
+ "num-traits",
+ "portable-atomic",
+ "portable-atomic-util",
  "rawpointer",
 ]
 
@@ -1588,18 +1743,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
- "num-traits 0.2.19",
+ "num-traits",
  "serde",
 ]
 
 [[package]]
 name = "num-complex"
-version = "0.2.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
- "autocfg",
- "num-traits 0.2.19",
+ "num-traits",
 ]
 
 [[package]]
@@ -1608,16 +1762,7 @@ version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "num-traits 0.2.19",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-dependencies = [
- "num-traits 0.2.19",
+ "num-traits",
 ]
 
 [[package]]
@@ -1631,9 +1776,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "oorandom"
@@ -1649,28 +1794,29 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.6.12"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee"
+checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590"
 dependencies = [
  "arrayvec",
  "bitvec",
  "byte-slice-cast",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive",
+ "rustversion",
  "serde",
 ]
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.6.12"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
+checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -1704,9 +1850,9 @@ checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef"
 
 [[package]]
 name = "pathdiff"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
 
 [[package]]
 name = "percent-encoding"
@@ -1721,7 +1867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
 ]
 
 [[package]]
@@ -1741,9 +1887,9 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -1753,9 +1899,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "precomputed-hash"
@@ -1792,9 +1947,9 @@ dependencies = [
 
 [[package]]
 name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
 dependencies = [
  "diff",
  "yansi",
@@ -1802,18 +1957,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -1854,9 +2009,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -1904,18 +2059,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
  "libredox",
@@ -1924,13 +2079,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.8",
+ "regex-automata 0.4.9",
  "regex-syntax 0.8.5",
 ]
 
@@ -1945,9 +2100,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1978,7 +2133,7 @@ version = "0.17.0-pre.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719825638c59fd26a55412a24561c7c5bcf54364c88b9a7a04ba08a6eafaba8d"
 dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
  "lock_api",
  "oorandom",
  "parking_lot",
@@ -1998,7 +2153,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -2009,9 +2164,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -2022,9 +2177,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "ryu"
@@ -2097,7 +2252,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -2117,22 +2272,22 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -2143,14 +2298,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.122"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
@@ -2166,14 +2321,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -2249,13 +2404,14 @@ dependencies = [
 
 [[package]]
 name = "sprs"
-version = "0.7.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec63571489873d4506683915840eeb1bb16b3198ee4894cc6f2fe3013d505e56"
+checksum = "704ef26d974e8a452313ed629828cd9d4e4fa34667ca1ad9d6b1fffa43c6e166"
 dependencies = [
  "ndarray",
  "num-complex",
- "num-traits 0.1.43",
+ "num-traits",
+ "smallvec",
 ]
 
 [[package]]
@@ -2266,16 +2422,16 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "starknet-types-core"
-version = "0.1.5"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6bacf0ba19bc721e518bc4bf389ff13daa8a7c5db5fd320600473b8aa9fcbd"
+checksum = "fa1b9e01ccb217ab6d475c5cda05dbb22c30029f7bb52b192a010a00d77a3d74"
 dependencies = [
  "lambdaworks-crypto",
  "lambdaworks-math",
  "lazy_static",
  "num-bigint",
  "num-integer",
- "num-traits 0.2.19",
+ "num-traits",
  "serde",
 ]
 
@@ -2305,15 +2461,26 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+]
+
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -2322,9 +2489,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -2369,27 +2536,27 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -2412,20 +2579,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "tinystr"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
- "tinyvec_macros",
+ "displaydoc",
+ "zerovec",
 ]
 
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
 [[package]]
 name = "toml"
 version = "0.8.19"
@@ -2435,7 +2597,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit",
 ]
 
 [[package]]
@@ -2449,33 +2611,22 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.21.1"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.3.0",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
-dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.18",
+ "winnow",
 ]
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -2484,13 +2635,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -2506,9 +2657,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -2574,32 +2725,17 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-width"
@@ -2609,15 +2745,15 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -2625,6 +2761,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -2661,34 +2809,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2696,28 +2845,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2904,21 +3053,24 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "winnow"
-version = "0.6.18"
+name = "write16"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
-dependencies = [
- "memchr",
-]
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
 [[package]]
 name = "wyz"
@@ -2931,18 +3083,18 @@ dependencies = [
 
 [[package]]
 name = "xshell"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db0ab86eae739efd1b054a8d3d16041914030ac4e01cd1dca0cf252fd8b6437"
+checksum = "9e7290c623014758632efe00737145b6867b66292c42167f2ec381eb566a373d"
 dependencies = [
  "xshell-macros",
 ]
 
 [[package]]
 name = "xshell-macros"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852"
+checksum = "32ac00cd3f8ec9c1d33fb3e7958a82df6989c42d747bd326c822b1d625283547"
 
 [[package]]
 name = "xxhash-rust"
@@ -2952,9 +3104,33 @@ checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
 
 [[package]]
 name = "yansi"
-version = "0.5.1"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
+[[package]]
+name = "yoke"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+ "synstructure",
+]
 
 [[package]]
 name = "zerocopy"
@@ -2973,5 +3149,48 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.72",
+ "syn 2.0.89",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.89",
 ]

From 888f4d3aaa59eabd3095c9c77fbd00362c9eb38e Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 11:27:52 +0100
Subject: [PATCH 17/23] Base the `ci` profile off `test` and enable incremental
 compilation

---
 Cargo.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6c6548ba..0884b626 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -67,8 +67,7 @@ test-log = "0.2.16"
 # while crates in this workspace are built with `dev` profile and full debug info.
 # This is a trade-off between build time and e2e test time.
 [profile.ci]
-inherits = "dev"
-incremental = false
+inherits = "test"
 [profile.ci.package."*"] # external dependencies
 opt-level = 1
 [profile.ci.package."rust-analyzer-salsa"]

From ba168d76f19be0a037eea2f0884da6239f4d4a07 Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 12:07:48 +0100
Subject: [PATCH 18/23] Typos

---
 src/project/unmanaged_core_crate.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/project/unmanaged_core_crate.rs b/src/project/unmanaged_core_crate.rs
index 6b93ca27..0bce9420 100644
--- a/src/project/unmanaged_core_crate.rs
+++ b/src/project/unmanaged_core_crate.rs
@@ -27,7 +27,7 @@ pub fn try_to_init_unmanaged_core(
 }
 
 /// Try to find a Cairo `core` crate in various well-known places, for use in project backends that
-/// do not manage the `core` crate (i.e., anything non-Scarb).
+/// do not manage the `core` crate (i.e. anything non-Scarb).
 ///
 /// The path is guaranteed to be absolute, so it can be safely used as a `FileId` in LS Salsa DB.
 pub fn find_unmanaged_core(config: &Config, scarb: &ScarbToolchain) -> Option<PathBuf> {
@@ -108,7 +108,7 @@ fn find_scarb_managed_core(scarb: &ScarbToolchain) -> Option<PathBuf> {
         let metadata = scarb.silent().metadata(&scarb_toml).inspect_err(|e| warn!("{e:?}")).ok()?;
 
         // Ensure the workspace directory is deleted after running Scarb.
-        // We are ignoring the error, leaving doing proper cleanup to the OS.
+        // We are ignoring the error, leaving doing proper clean-up to the OS.
         let _ = workspace
             .close()
             .context("failed to wipe temporary directory")

From b087f3818dcbc857f82a6d0731bfa5bc1156f7dc Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 12:13:21 +0100
Subject: [PATCH 19/23] Require Scarb for development and testing

---
 .github/workflows/ci.yml | 1 +
 .tool-versions           | 1 +
 CONTRIBUTING.md          | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .tool-versions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40973fde..ab377d24 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,6 +44,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
+      - uses: software-mansion/setup-scarb@v1
       - uses: taiki-e/install-action@nextest
       - uses: actions/download-artifact@v4
         with:
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 00000000..833d72b5
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+scarb nightly-2024-11-27
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4caea30c..35263a26 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,8 +15,10 @@ email, or any other method with the owners of this repository before making a ch
 
 ## Environment setup
 
-The latest stable Rust is the only thing you really need.
-It is recommended to use [rustup](https://rustup.rs/) for getting it.
+Install the latest stable Rust via [rustup](https://rustup.rs/).
+
+Install [Scarb via ASDF](https://docs.swmansion.com/scarb/download.html#install-via-asdf)
+and ensure you have installed the version we require in our [ `.tool-versions`](.tool-versions).
 
 This document assumes that you are using Visual Studio Code with
 the [Cairo extension](https://marketplace.visualstudio.com/items?itemName=starkware.cairo1) as the

From 022d3e35e3039bdd585436e197ee655fc576b7d8 Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 14:20:12 +0100
Subject: [PATCH 20/23] Use Scarb-managed `core` in tests

---
 Cargo.lock                           | 28 +++++++++++++
 Cargo.toml                           |  1 +
 src/project/unmanaged_core_crate.rs  |  7 ----
 src/toolchain/scarb.rs               | 10 +++++
 tests/e2e/analysis.rs                |  2 +-
 tests/e2e/support/mod.rs             |  1 +
 tests/e2e/support/normalize.rs       |  7 +++-
 tests/e2e/support/scarb.rs           | 61 ++++++++++++++++++++++++++++
 tests/e2e/workspace_configuration.rs |  3 +-
 9 files changed, 109 insertions(+), 11 deletions(-)
 create mode 100644 tests/e2e/support/scarb.rs

diff --git a/Cargo.lock b/Cargo.lock
index 495f4036..c79d7fa4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -752,6 +752,7 @@ dependencies = [
  "tracing",
  "tracing-chrome",
  "tracing-subscriber",
+ "which",
 ]
 
 [[package]]
@@ -1250,6 +1251,15 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "icu_collections"
 version = "1.5.0"
@@ -2872,6 +2882,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "which"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b"
+dependencies = [
+ "either",
+ "home",
+ "rustix",
+ "winsafe",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -3060,6 +3082,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winsafe"
+version = "0.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
+
 [[package]]
 name = "write16"
 version = "1.0.0"
diff --git a/Cargo.toml b/Cargo.toml
index 0884b626..1d4b2b01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,6 +49,7 @@ tempfile = "3"
 tracing = "0.1"
 tracing-chrome = "0.7.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+which = "7.0.0"
 
 [target.'cfg(target_vendor = "apple")'.dependencies]
 libc = "0.2.155"
diff --git a/src/project/unmanaged_core_crate.rs b/src/project/unmanaged_core_crate.rs
index 0bce9420..d9f9b552 100644
--- a/src/project/unmanaged_core_crate.rs
+++ b/src/project/unmanaged_core_crate.rs
@@ -33,13 +33,6 @@ pub fn try_to_init_unmanaged_core(
 pub fn find_unmanaged_core(config: &Config, scarb: &ScarbToolchain) -> Option<PathBuf> {
     find_core_at_config_path(config)
         .or_else(|| find_scarb_managed_core(scarb))
-        .or_else(|| {
-            if cfg!(feature = "testing") {
-                cairo_lang_filesystem::detect::detect_corelib()
-            } else {
-                None
-            }
-        })
         .and_then(ensure_absolute)
 }
 
diff --git a/src/toolchain/scarb.rs b/src/toolchain/scarb.rs
index d52fead5..ef315ee2 100644
--- a/src/toolchain/scarb.rs
+++ b/src/toolchain/scarb.rs
@@ -6,6 +6,7 @@ use anyhow::{Context, Result, bail};
 use lsp_types::notification::Notification;
 use scarb_metadata::{Metadata, MetadataCommand};
 use tracing::{error, warn};
+use which::which;
 
 use crate::env_config;
 use crate::lsp::ext::ScarbMetadataFailed;
@@ -47,6 +48,15 @@ impl ScarbToolchain {
     fn discover(&self) -> Option<&Path> {
         self.scarb_path_cell
             .get_or_init(|| {
+                // While running tests, we do not have SCARB env set,
+                // but we expect `scarb` binary to be in the PATH.
+                if cfg!(feature = "testing") {
+                    return Some(
+                        which("scarb")
+                            .expect("running tests requires a `scarb` binary available in `PATH`"),
+                    );
+                }
+
                 let path = env_config::scarb_path();
                 // TODO(mkaput): Perhaps we should display this notification again after reloading?
                 if path.is_none() {
diff --git a/tests/e2e/analysis.rs b/tests/e2e/analysis.rs
index 6128b058..7d39c0bc 100644
--- a/tests/e2e/analysis.rs
+++ b/tests/e2e/analysis.rs
@@ -39,7 +39,7 @@ fn cairo_projects() {
     assert_eq!(normalize(&ls, output), indoc! {r#"
             # Analyzed Crates
 
-            - `core`: `["[CAIRO_SOURCE]/corelib/src/lib.cairo"]`
+            - `core`: `["[SCARB_REGISTRY_STD]/core/src/lib.cairo"]`
                 ```rust
                 CrateSettings {
                     name: None,
diff --git a/tests/e2e/support/mod.rs b/tests/e2e/support/mod.rs
index 6feeeacc..d2139ddf 100644
--- a/tests/e2e/support/mod.rs
+++ b/tests/e2e/support/mod.rs
@@ -4,6 +4,7 @@ pub mod fixture;
 pub mod jsonrpc;
 mod mock_client;
 pub mod normalize;
+pub mod scarb;
 
 pub use self::cursor::cursors;
 pub use self::mock_client::MockClient;
diff --git a/tests/e2e/support/normalize.rs b/tests/e2e/support/normalize.rs
index 16c45120..822df62e 100644
--- a/tests/e2e/support/normalize.rs
+++ b/tests/e2e/support/normalize.rs
@@ -1,6 +1,7 @@
 use std::path::Path;
 
 use crate::support::fixture::Fixture;
+use crate::support::scarb::scarb_registry_std_path;
 
 /// Performs various normalization steps of the input data, to remove any runtime-specific artifacts
 /// and make comparisons in test assertions deterministic.
@@ -19,8 +20,10 @@ fn normalize_well_known_paths(fixture: &Fixture, data: String) -> String {
         data = data.replace(&normalize_path(&pwd), "[PWD]");
     }
 
-    let cairo_source = Path::new(env!("CARGO_MANIFEST_DIR")).parent().unwrap().parent().unwrap();
-    data = data.replace(&normalize_path(cairo_source), "[CAIRO_SOURCE]");
+    let cairols_source = Path::new(env!("CARGO_MANIFEST_DIR"));
+    data = data.replace(&normalize_path(cairols_source), "[CAIROLS_SOURCE]");
+
+    data = data.replace(&normalize_path(scarb_registry_std_path()), "[SCARB_REGISTRY_STD]");
 
     data
 }
diff --git a/tests/e2e/support/scarb.rs b/tests/e2e/support/scarb.rs
new file mode 100644
index 00000000..82d51096
--- /dev/null
+++ b/tests/e2e/support/scarb.rs
@@ -0,0 +1,61 @@
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::sync::LazyLock;
+
+use scarb_metadata::MetadataCommand;
+use tempfile::tempdir;
+
+/// Finds Scarb-managed `core` package.
+///
+/// This is a stripped-down version of similar logic in `unmanaged_core_crate` with these changes:
+/// - instant panicking instead of trying to recover,
+/// - using `scarb_metadata` directly instead of `ScarbToolchain`,
+/// - no tracing.
+pub fn scarb_core_path() -> &'static Path {
+    static CACHE: LazyLock<PathBuf> = LazyLock::new(|| {
+        let workspace = tempdir().expect("failed to create temporary directory");
+
+        let scarb_toml = workspace.path().join("Scarb.toml");
+        fs::write(
+            &scarb_toml,
+            r#"
+            [package]
+            name = "cairols_unmanaged_core_lookup"
+            version = "1.0.0"
+        "#,
+        )
+        .expect("failed to write Scarb.toml");
+
+        let metadata = MetadataCommand::new()
+            .manifest_path(scarb_toml)
+            .inherit_stderr()
+            .exec()
+            .expect("failed to execute: scarb metadata");
+
+        // Ensure the workspace directory is deleted after running Scarb.
+        workspace.close().expect("failed to wipe temporary directory");
+
+        // Scarb is expected to generate only one compilation unit (for our stub package)
+        // that will consist of this package and the `core` crate.
+        // Therefore, we allow ourselves to liberally just look for any first usage of a package
+        // named `core` in all compilation units components we got.
+        metadata
+            .compilation_units
+            .into_iter()
+            .find_map(|compilation_unit| {
+                compilation_unit
+                    .components
+                    .iter()
+                    .find(|component| component.name == "core")
+                    .map(|component| component.source_root().to_path_buf().into_std_path_buf())
+            })
+            .expect("failed to find `core` crate path")
+    });
+
+    &CACHE
+}
+
+/// Finds a path where Scarb unpacks its `std` source.
+pub fn scarb_registry_std_path() -> &'static Path {
+    scarb_core_path().parent().unwrap().parent().unwrap()
+}
diff --git a/tests/e2e/workspace_configuration.rs b/tests/e2e/workspace_configuration.rs
index c4908d47..117234d2 100644
--- a/tests/e2e/workspace_configuration.rs
+++ b/tests/e2e/workspace_configuration.rs
@@ -5,6 +5,7 @@ use lsp_types::request::Request as _;
 use serde_json::json;
 
 use crate::support::sandbox;
+use crate::support::scarb::scarb_core_path;
 
 /// The LS used to panic when some files in Salsa database were interned with a relative path.
 /// The panic happened while trying to create a `file://` URL to affected file.
@@ -18,7 +19,7 @@ use crate::support::sandbox;
 #[test]
 fn relative_path_to_core() {
     let core_path = {
-        let detected = cairo_lang_filesystem::detect::detect_corelib().unwrap();
+        let detected = scarb_core_path();
         let pwd = std::env::current_dir().unwrap();
         let path = pathdiff::diff_paths(detected, pwd).unwrap();
         assert!(path.is_relative());

From edfc410ae15d0a68cc37c2b48ea6ad2ef0c2826b Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Thu, 28 Nov 2024 15:02:12 +0100
Subject: [PATCH 21/23] Bumped version to 2.9.0

Co-authored-by: orizi <104711814+orizi@users.noreply.github.com>
Signed-off-by: Marek Kaput <marek.kaput@swmansion.com>
---
 Cargo.lock            | 116 +++++++++++++++++++++---------------------
 Cargo.toml            |  32 ++++++------
 tests/e2e/analysis.rs |   4 +-
 3 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c79d7fa4..918eccb2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "ahash"
@@ -198,8 +198,8 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
 [[package]]
 name = "cairo-lang-casm"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-utils",
  "indoc",
@@ -211,8 +211,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-compiler"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "anyhow",
  "cairo-lang-defs",
@@ -236,16 +236,16 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-debug"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-utils",
 ]
 
 [[package]]
 name = "cairo-lang-defs"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-diagnostics",
@@ -260,8 +260,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-diagnostics"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -271,8 +271,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-doc"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -291,8 +291,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-eq-solver"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-utils",
  "good_lp",
@@ -300,8 +300,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-filesystem"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-utils",
@@ -315,8 +315,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-formatter"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "anyhow",
  "cairo-lang-diagnostics",
@@ -334,8 +334,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-lowering"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -387,8 +387,8 @@ checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf"
 
 [[package]]
 name = "cairo-lang-parser"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
@@ -406,8 +406,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-plugins"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
@@ -424,8 +424,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-proc-macros"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-debug",
  "quote",
@@ -434,8 +434,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-project"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-utils",
@@ -446,8 +446,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-semantic"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -471,8 +471,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "anyhow",
  "cairo-lang-utils",
@@ -497,8 +497,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-ap-change"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -512,8 +512,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-gas"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -527,8 +527,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-generator"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -550,8 +550,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-to-casm"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "assert_matches",
  "cairo-lang-casm",
@@ -570,8 +570,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-type-size"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-sierra",
  "cairo-lang-utils",
@@ -579,8 +579,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-starknet"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -608,8 +608,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-starknet-classes"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-casm",
  "cairo-lang-sierra",
@@ -630,8 +630,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-syntax"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -645,8 +645,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-syntax-codegen"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "genco",
  "xshell",
@@ -654,8 +654,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-test-plugin"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -680,8 +680,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-test-utils"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "cairo-lang-formatter",
  "cairo-lang-utils",
@@ -692,8 +692,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-utils"
-version = "2.8.5"
-source = "git+https://github.com/starkware-libs/cairo?rev=0d9de394455f51edb3ff93f2f5e9699859e5760b#0d9de394455f51edb3ff93f2f5e9699859e5760b"
+version = "2.9.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
 dependencies = [
  "hashbrown 0.14.5",
  "indexmap 2.6.0",
@@ -706,7 +706,7 @@ dependencies = [
 
 [[package]]
 name = "cairo-language-server"
-version = "2.8.5"
+version = "2.9.0"
 dependencies = [
  "anyhow",
  "assert_fs",
diff --git a/Cargo.toml b/Cargo.toml
index 1d4b2b01..30e67649 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cairo-language-server"
-version = "2.8.5"
+version = "2.9.0"
 edition = "2021"
 
 authors = ["Software Mansion <contact@swmansion.com>", "StarkWare <info@starkware.co>"]
@@ -13,20 +13,20 @@ testing = []
 
 [dependencies]
 anyhow = "1"
-cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
-cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b" }
+cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
 cairo-lang-macro = "0.1.1"
 convert_case = "0.6.0"
 crossbeam = "0.8.4"
@@ -57,7 +57,7 @@ libc = "0.2.155"
 [dev-dependencies]
 assert_fs = "1.1"
 cairo-language-server = { path = ".", features = ["testing"] }
-cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "0d9de394455f51edb3ff93f2f5e9699859e5760b", features = ["testing"] }
+cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184", features = ["testing"] }
 pathdiff = "0.2"
 pretty_assertions = "1.4.0"
 test-log = "0.2.16"
diff --git a/tests/e2e/analysis.rs b/tests/e2e/analysis.rs
index 7d39c0bc..6cfa1f28 100644
--- a/tests/e2e/analysis.rs
+++ b/tests/e2e/analysis.rs
@@ -47,8 +47,8 @@ fn cairo_projects() {
                     version: Some(
                         Version {
                             major: 2,
-                            minor: 8,
-                            patch: 5,
+                            minor: 9,
+                            patch: 0,
                         },
                     ),
                     cfg_set: None,

From 095f6ac6ab7ebe2819b7c7817b746273aa176e7a Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Fri, 29 Nov 2024 10:22:55 +0100
Subject: [PATCH 22/23] Bumped version to 2.9.1

Co-authored-by: Ori Ziv <oriz@starkware.co>
Signed-off-by: Marek Kaput <marek.kaput@swmansion.com>
---
 Cargo.lock            | 120 ++++++++++++++++++++++--------------------
 Cargo.toml            |  32 +++++------
 tests/e2e/analysis.rs |   2 +-
 3 files changed, 80 insertions(+), 74 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 918eccb2..0a04de4f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -198,8 +198,8 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
 [[package]]
 name = "cairo-lang-casm"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-utils",
  "indoc",
@@ -211,8 +211,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-compiler"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "anyhow",
  "cairo-lang-defs",
@@ -236,16 +236,16 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-debug"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-utils",
 ]
 
 [[package]]
 name = "cairo-lang-defs"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-diagnostics",
@@ -260,8 +260,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-diagnostics"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -271,8 +271,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-doc"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -291,8 +291,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-eq-solver"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-utils",
  "good_lp",
@@ -300,8 +300,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-filesystem"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-utils",
@@ -315,8 +315,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-formatter"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "anyhow",
  "cairo-lang-diagnostics",
@@ -334,8 +334,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-lowering"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -387,8 +387,8 @@ checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf"
 
 [[package]]
 name = "cairo-lang-parser"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
@@ -406,8 +406,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-plugins"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
@@ -422,10 +422,15 @@ dependencies = [
  "smol_str",
 ]
 
+[[package]]
+name = "cairo-lang-primitive-token"
+version = "1.0.0"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
+
 [[package]]
 name = "cairo-lang-proc-macros"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-debug",
  "quote",
@@ -434,8 +439,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-project"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-utils",
@@ -446,8 +451,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-semantic"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -471,8 +476,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "anyhow",
  "cairo-lang-utils",
@@ -497,8 +502,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-ap-change"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -512,8 +517,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-gas"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -527,8 +532,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-generator"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -550,8 +555,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-to-casm"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "assert_matches",
  "cairo-lang-casm",
@@ -570,8 +575,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-sierra-type-size"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-sierra",
  "cairo-lang-utils",
@@ -579,8 +584,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-starknet"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -608,8 +613,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-starknet-classes"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-casm",
  "cairo-lang-sierra",
@@ -630,11 +635,12 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-syntax"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
+ "cairo-lang-primitive-token",
  "cairo-lang-utils",
  "num-bigint",
  "num-traits",
@@ -645,8 +651,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-syntax-codegen"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "genco",
  "xshell",
@@ -654,8 +660,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-test-plugin"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -680,8 +686,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-test-utils"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "cairo-lang-formatter",
  "cairo-lang-utils",
@@ -692,8 +698,8 @@ dependencies = [
 
 [[package]]
 name = "cairo-lang-utils"
-version = "2.9.0"
-source = "git+https://github.com/starkware-libs/cairo?rev=3c5a2f414204388da4db6f9530cd22e6d1ba5184#3c5a2f414204388da4db6f9530cd22e6d1ba5184"
+version = "2.9.1"
+source = "git+https://github.com/starkware-libs/cairo?rev=6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308#6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308"
 dependencies = [
  "hashbrown 0.14.5",
  "indexmap 2.6.0",
@@ -706,7 +712,7 @@ dependencies = [
 
 [[package]]
 name = "cairo-language-server"
-version = "2.9.0"
+version = "2.9.1"
 dependencies = [
  "anyhow",
  "assert_fs",
diff --git a/Cargo.toml b/Cargo.toml
index 30e67649..69fa2ea7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cairo-language-server"
-version = "2.9.0"
+version = "2.9.1"
 edition = "2021"
 
 authors = ["Software Mansion <contact@swmansion.com>", "StarkWare <info@starkware.co>"]
@@ -13,20 +13,20 @@ testing = []
 
 [dependencies]
 anyhow = "1"
-cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
-cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184" }
+cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308" }
 cairo-lang-macro = "0.1.1"
 convert_case = "0.6.0"
 crossbeam = "0.8.4"
@@ -57,7 +57,7 @@ libc = "0.2.155"
 [dev-dependencies]
 assert_fs = "1.1"
 cairo-language-server = { path = ".", features = ["testing"] }
-cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "3c5a2f414204388da4db6f9530cd22e6d1ba5184", features = ["testing"] }
+cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "6512b4bf99d49afd6d50129ee5d1f8f4f6fbc308", features = ["testing"] }
 pathdiff = "0.2"
 pretty_assertions = "1.4.0"
 test-log = "0.2.16"
diff --git a/tests/e2e/analysis.rs b/tests/e2e/analysis.rs
index 6cfa1f28..e345a0ba 100644
--- a/tests/e2e/analysis.rs
+++ b/tests/e2e/analysis.rs
@@ -48,7 +48,7 @@ fn cairo_projects() {
                         Version {
                             major: 2,
                             minor: 9,
-                            patch: 0,
+                            patch: 1,
                         },
                     ),
                     cfg_set: None,

From dd5c34bbe6ea9b54962bf3d959bbc5f2bf831adc Mon Sep 17 00:00:00 2001
From: Marek Kaput <marek.kaput@swmansion.com>
Date: Fri, 29 Nov 2024 16:49:00 +0100
Subject: [PATCH 23/23] fixup! Update CONTRIBUTING.md

Signed-off-by: Marek Kaput <marek.kaput@swmansion.com>
---
 CONTRIBUTING.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 35263a26..9704cd15 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,8 +28,7 @@ the [Cairo extension's contributing guidelines](https://github.com/software-mans
 
 ## Testing
 
-We are building an extensive end-to-end tests suite for
-CairoLS [here](crates/cairo-lang-language-server/tests/e2e).
+We are building an extensive end-to-end tests suite for CairoLS [here](./tests/e2e).
 These tests implement a simple language client that you can control (like put a cursor at certain
 position, send a request to the server, etc.).
 Check out existing tests for examples of what you can do.