Merge remote-tracking branch 'origin/dev-v2.7.1' into orizi/merge-dev…

…-v2.7.1-into-main No conflict resolution.
starkware-libs · Aug 13, 2024 · 5124f49 · 5124f49
2 parents 15b8c69 + 964a02d
commit 5124f49
Show file tree

Hide file tree

Showing 86 changed files with 473 additions and 256 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -71,7 +71,7 @@ members = [
 exclude = ["ensure-no_std"]
 
 [workspace.package]
-version = "2.7.0"
+version = "2.7.1"
 edition = "2021"
 repository = "https://github.com/starkware-libs/cairo/"
 license = "Apache-2.0"
@@ -85,7 +85,7 @@ ark-secp256r1 = "0.4.0"
 ark-std = "0.4.0"
 assert_matches = "1.5"
 bimap = "0.6.3"
-cairo-vm = { version = "1.0.0-rc6", 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"
@@ -121,6 +121,7 @@ rayon = "1.10.0"
 rstest = "0.19.0"
 salsa = "0.16.1"
 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"

diff --git a/corelib/Scarb.toml b/corelib/Scarb.toml
@@ -1,6 +1,6 @@
 [package]
 name = "core"
-version = "2.7.0"
+version = "2.7.1"
 edition = "2024_07"
 experimental-features = ["coupons", "negative_impls"]
 
@@ -9,4 +9,4 @@ experimental-features = ["coupons", "negative_impls"]
 no-core = true
 
 [dev-dependencies]
-cairo_test = "2.7.0"
+cairo_test = "2.7.1"
diff --git a/corelib/cairo_project.toml b/corelib/cairo_project.toml
@@ -2,6 +2,7 @@
 core = "src"
 
 [config.global]
+version = "2.7.1"
 edition = "2024_07"
 
 [config.global.experimental_features]

diff --git a/corelib/src/internal.cairo b/corelib/src/internal.cairo
@@ -1,3 +1,9 @@
+<<<<<<< HEAD
+||||||| 223ca9963
+use core::integer::upcast;
+=======
+use core::integer::{downcast, upcast};
+>>>>>>> origin/dev-v2.7.1
 pub extern fn revoke_ap_tracking() implicits() nopanic;
 
 /// Function to enforce that `Implicit` is used by a function calling it.
@@ -7,4 +13,71 @@ pub extern fn require_implicit<Implicit>() implicits(Implicit) nopanic;
 
 extern type index_enum_type<const NUM_VARIANTS: felt252>;
 
+<<<<<<< HEAD
 pub(crate) mod bounded_int;
+||||||| 223ca9963
+#[derive(Copy, Drop)]
+pub(crate) extern type BoundedInt<const MIN: felt252, const MAX: felt252>;
+impl NumericLiteralBoundedInt<
+    const MIN: felt252, const MAX: felt252
+> of core::integer::NumericLiteral<BoundedInt<MIN, MAX>>;
+
+impl BoundedIntIntoFelt252<
+    const MIN: felt252, const MAX: felt252
+> of Into<BoundedInt<MIN, MAX>, felt252> {
+    fn into(self: BoundedInt<MIN, MAX>) -> felt252 {
+        upcast(self)
+    }
+}
+
+impl BoundedIntPartialEq<
+    const MIN: felt252, const MAX: felt252
+> of PartialEq<BoundedInt<MIN, MAX>> {
+    #[inline(always)]
+    fn eq(lhs: @BoundedInt<MIN, MAX>, rhs: @BoundedInt<MIN, MAX>) -> bool {
+        Into::<_, felt252>::into(*lhs) == (*rhs).into()
+    }
+}
+
+impl BoundedIntDebug<const MIN: felt252, const MAX: felt252> =
+    core::fmt::into_felt252_based::DebugImpl<BoundedInt<MIN, MAX>>;
+=======
+#[derive(Copy, Drop)]
+pub(crate) extern type BoundedInt<const MIN: felt252, const MAX: felt252>;
+impl NumericLiteralBoundedInt<
+    const MIN: felt252, const MAX: felt252
+> of core::integer::NumericLiteral<BoundedInt<MIN, MAX>>;
+
+impl BoundedIntIntoFelt252<
+    const MIN: felt252, const MAX: felt252
+> of Into<BoundedInt<MIN, MAX>, felt252> {
+    fn into(self: BoundedInt<MIN, MAX>) -> felt252 {
+        upcast(self)
+    }
+}
+
+impl Felt252TryIntoBoundedInt<
+    const MIN: felt252, const MAX: felt252
+> of TryInto<felt252, BoundedInt<MIN, MAX>> {
+    fn try_into(self: felt252) -> Option<BoundedInt<MIN, MAX>> {
+        // Using `downcast` is allowed, since `BoundedInt` itself is not `pub`, and only has few
+        // specific `pub` instances, such as `u96`, `ConstZero` and `ConstOne`.
+        downcast(self)
+    }
+}
+
+impl BoundedIntSerde<const MIN: felt252, const MAX: felt252> =
+    core::serde::into_felt252_based::SerdeImpl<BoundedInt<MIN, MAX>>;
+
+impl BoundedIntPartialEq<
+    const MIN: felt252, const MAX: felt252
+> of PartialEq<BoundedInt<MIN, MAX>> {
+    #[inline(always)]
+    fn eq(lhs: @BoundedInt<MIN, MAX>, rhs: @BoundedInt<MIN, MAX>) -> bool {
+        Into::<_, felt252>::into(*lhs) == (*rhs).into()
+    }
+}
+
+impl BoundedIntDebug<const MIN: felt252, const MAX: felt252> =
+    core::fmt::into_felt252_based::DebugImpl<BoundedInt<MIN, MAX>>;
+>>>>>>> origin/dev-v2.7.1
diff --git a/crates/bin/cairo-compile/Cargo.toml b/crates/bin/cairo-compile/Cargo.toml
@@ -11,8 +11,8 @@ anyhow.workspace = true
 clap.workspace = true
 log.workspace = true
 
-cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "~2.7.0" }
-cairo-lang-lowering = { path = "../../cairo-lang-lowering", version = "~2.7.0" }
-cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.0", features = [
+cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "~2.7.1" }
+cairo-lang-lowering = { path = "../../cairo-lang-lowering", version = "~2.7.1" }
+cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.1", features = [
     "env_logger",
 ] }
diff --git a/crates/bin/cairo-format/Cargo.toml b/crates/bin/cairo-format/Cargo.toml
@@ -12,7 +12,7 @@ log.workspace = true
 colored.workspace = true
 ignore.workspace = true
 
-cairo-lang-formatter = { path = "../../cairo-lang-formatter", version = "~2.7.0" }
-cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.0", features = [
+cairo-lang-formatter = { path = "../../cairo-lang-formatter", version = "~2.7.1" }
+cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.1", features = [
     "env_logger",
 ] }
diff --git a/crates/bin/cairo-language-server/Cargo.toml b/crates/bin/cairo-language-server/Cargo.toml
@@ -7,4 +7,4 @@ 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.7.0" }
+cairo-lang-language-server = { path = "../../cairo-lang-language-server", version = "~2.7.1" }
diff --git a/crates/bin/cairo-run/Cargo.toml b/crates/bin/cairo-run/Cargo.toml
@@ -10,8 +10,8 @@ description = "Runner executable for the Cairo programming language"
 anyhow.workspace = true
 clap.workspace = true
 
-cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "~2.7.0" }
-cairo-lang-diagnostics = { path = "../../cairo-lang-diagnostics", version = "~2.7.0" }
-cairo-lang-runner = { path = "../../cairo-lang-runner", version = "~2.7.0" }
-cairo-lang-sierra-generator = { path = "../../cairo-lang-sierra-generator", version = "~2.7.0" }
-cairo-lang-starknet = { path = "../../cairo-lang-starknet", version = "~2.7.0" }
+cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "~2.7.1" }
+cairo-lang-diagnostics = { path = "../../cairo-lang-diagnostics", version = "~2.7.1" }
+cairo-lang-runner = { path = "../../cairo-lang-runner", version = "~2.7.1" }
+cairo-lang-sierra-generator = { path = "../../cairo-lang-sierra-generator", version = "~2.7.1" }
+cairo-lang-starknet = { path = "../../cairo-lang-starknet", version = "~2.7.1" }
diff --git a/crates/bin/cairo-test/Cargo.toml b/crates/bin/cairo-test/Cargo.toml
@@ -11,5 +11,5 @@ anyhow.workspace = true
 clap.workspace = true
 serde = { workspace = true, default-features = true }
 
-cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "~2.7.0" }
-cairo-lang-test-runner = { path = "../../cairo-lang-test-runner", version = "~2.7.0" }
+cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "~2.7.1" }
+cairo-lang-test-runner = { path = "../../cairo-lang-test-runner", version = "~2.7.1" }
diff --git a/crates/bin/generate-syntax/Cargo.toml b/crates/bin/generate-syntax/Cargo.toml
@@ -8,7 +8,7 @@ license-file.workspace = true
 [dependencies]
 log.workspace = true
 
-cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.0", features = [
+cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.1", features = [
     "env_logger",
 ] }
-cairo-lang-syntax-codegen = { path = "../../cairo-lang-syntax-codegen", version = "~2.7.0" }
+cairo-lang-syntax-codegen = { path = "../../cairo-lang-syntax-codegen", version = "~2.7.1" }
diff --git a/crates/bin/get-lowering/Cargo.toml b/crates/bin/get-lowering/Cargo.toml
@@ -11,11 +11,11 @@ anyhow.workspace = true
 clap.workspace = true
 convert_case.workspace = true
 itertools.workspace = true
-cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "2.7.0" }
-cairo-lang-debug = { path = "../../cairo-lang-debug", version = "2.7.0" }
-cairo-lang-defs = { path = "../../cairo-lang-defs", version = "2.7.0" }
-cairo-lang-filesystem = { path = "../../cairo-lang-filesystem", version = "~2.7.0" }
-cairo-lang-lowering = { path = "../../cairo-lang-lowering", version = "~2.7.0" }
-cairo-lang-starknet = { path = "../../cairo-lang-starknet", version = "~2.7.0" }
-cairo-lang-semantic = { path = "../../cairo-lang-semantic", version = "~2.7.0" }
-cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.0" }
+cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "2.7.1" }
+cairo-lang-debug = { path = "../../cairo-lang-debug", version = "2.7.1" }
+cairo-lang-defs = { path = "../../cairo-lang-defs", version = "2.7.1" }
+cairo-lang-filesystem = { path = "../../cairo-lang-filesystem", version = "~2.7.1" }
+cairo-lang-lowering = { path = "../../cairo-lang-lowering", version = "~2.7.1" }
+cairo-lang-starknet = { path = "../../cairo-lang-starknet", version = "~2.7.1" }
+cairo-lang-semantic = { path = "../../cairo-lang-semantic", version = "~2.7.1" }
+cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.1" }
diff --git a/crates/bin/sierra-compile/Cargo.toml b/crates/bin/sierra-compile/Cargo.toml
@@ -12,8 +12,8 @@ log.workspace = true
 clap.workspace = true
 indoc.workspace = true
 
-cairo-lang-sierra = { path = "../../cairo-lang-sierra", version = "~2.7.0" }
-cairo-lang-sierra-to-casm = { path = "../../cairo-lang-sierra-to-casm", version = "~2.7.0" }
-cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.0", features = [
+cairo-lang-sierra = { path = "../../cairo-lang-sierra", version = "~2.7.1" }
+cairo-lang-sierra-to-casm = { path = "../../cairo-lang-sierra-to-casm", version = "~2.7.1" }
+cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.1", features = [
     "env_logger",
 ] }
diff --git a/crates/bin/starknet-compile/Cargo.toml b/crates/bin/starknet-compile/Cargo.toml
@@ -10,6 +10,6 @@ description = "Compiler executable for the Cairo programming language with the S
 anyhow.workspace = true
 clap.workspace = true
 
-cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "~2.7.0" }
-cairo-lang-starknet = { path = "../../cairo-lang-starknet", version = "~2.7.0" }
-cairo-lang-starknet-classes = { path = "../../cairo-lang-starknet-classes", version = "~2.7.0" }
+cairo-lang-compiler = { path = "../../cairo-lang-compiler", version = "~2.7.1" }
+cairo-lang-starknet = { path = "../../cairo-lang-starknet", version = "~2.7.1" }
+cairo-lang-starknet-classes = { path = "../../cairo-lang-starknet-classes", version = "~2.7.1" }
diff --git a/crates/bin/starknet-sierra-compile/Cargo.toml b/crates/bin/starknet-sierra-compile/Cargo.toml
@@ -12,6 +12,6 @@ clap.workspace = true
 serde = { workspace = true, default-features = true }
 serde_json.workspace = true
 
-cairo-lang-sierra = { path = "../../cairo-lang-sierra", version = "~2.7.0" }
-cairo-lang-starknet-classes = { path = "../../cairo-lang-starknet-classes", version = "~2.7.0" }
-cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.0", features = ["serde"] }
+cairo-lang-sierra = { path = "../../cairo-lang-sierra", version = "~2.7.1" }
+cairo-lang-starknet-classes = { path = "../../cairo-lang-starknet-classes", version = "~2.7.1" }
+cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.1", features = ["serde"] }
diff --git a/crates/bin/starknet-sierra-extract-code/Cargo.toml b/crates/bin/starknet-sierra-extract-code/Cargo.toml
@@ -8,6 +8,6 @@ description = "Compiler executable for printing Starknet Sierra json included co
 
 [dependencies]
 anyhow.workspace = true
-cairo-lang-starknet-classes = { path = "../../cairo-lang-starknet-classes", version = "~2.7.0" }
+cairo-lang-starknet-classes = { path = "../../cairo-lang-starknet-classes", version = "~2.7.1" }
 clap.workspace = true
 serde_json.workspace = true
diff --git a/crates/bin/starknet-sierra-upgrade-validate/Cargo.toml b/crates/bin/starknet-sierra-upgrade-validate/Cargo.toml
@@ -15,8 +15,8 @@ reqwest = { version = "0.12", features = ["json"] }
 serde = { workspace = true, default-features = true }
 serde_json.workspace = true
 tokio.workspace = true
-cairo-lang-starknet-classes = { path = "../../cairo-lang-starknet-classes", version = "~2.7.0" }
-cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.0", features = [
+cairo-lang-starknet-classes = { path = "../../cairo-lang-starknet-classes", version = "~2.7.1" }
+cairo-lang-utils = { path = "../../cairo-lang-utils", version = "~2.7.1", features = [
     "serde",
 ] }
 

diff --git a/crates/cairo-lang-casm/Cargo.toml b/crates/cairo-lang-casm/Cargo.toml
@@ -7,7 +7,7 @@ license-file.workspace = true
 description = "Cairo assembly encoding."
 
 [dependencies]
-cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0", default-features = false }
+cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1", default-features = false }
 indoc.workspace = true
 num-bigint = { workspace = true }
 num-traits = { workspace = true }

diff --git a/crates/cairo-lang-compiler/Cargo.toml b/crates/cairo-lang-compiler/Cargo.toml
@@ -8,20 +8,21 @@ description = "Cairo compiler."
 
 [dependencies]
 anyhow.workspace = true
-cairo-lang-defs = { path = "../cairo-lang-defs", version = "~2.7.0" }
-cairo-lang-diagnostics = { path = "../cairo-lang-diagnostics", version = "~2.7.0" }
-cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.0" }
-cairo-lang-lowering = { path = "../cairo-lang-lowering", version = "~2.7.0" }
-cairo-lang-parser = { path = "../cairo-lang-parser", version = "~2.7.0" }
-cairo-lang-project = { path = "../cairo-lang-project", version = "~2.7.0" }
-cairo-lang-semantic = { path = "../cairo-lang-semantic", version = "~2.7.0", features = ["testing"] }
-cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.0" }
-cairo-lang-sierra-generator = { path = "../cairo-lang-sierra-generator", version = "~2.7.0" }
-cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.7.0" }
-cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" }
+cairo-lang-defs = { path = "../cairo-lang-defs", version = "~2.7.1" }
+cairo-lang-diagnostics = { path = "../cairo-lang-diagnostics", version = "~2.7.1" }
+cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.1" }
+cairo-lang-lowering = { path = "../cairo-lang-lowering", version = "~2.7.1" }
+cairo-lang-parser = { path = "../cairo-lang-parser", version = "~2.7.1" }
+cairo-lang-project = { path = "../cairo-lang-project", version = "~2.7.1" }
+cairo-lang-semantic = { path = "../cairo-lang-semantic", version = "~2.7.1", features = ["testing"] }
+cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.1" }
+cairo-lang-sierra-generator = { path = "../cairo-lang-sierra-generator", version = "~2.7.1" }
+cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.7.1" }
+cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" }
 indoc.workspace = true
 rayon.workspace = true
 salsa.workspace = true
+semver.workspace = true
 smol_str.workspace = true
 thiserror.workspace = true
 

diff --git a/crates/cairo-lang-compiler/src/db.rs b/crates/cairo-lang-compiler/src/db.rs
@@ -1,16 +1,16 @@
 use std::sync::Arc;
 
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, bail, Result};
 use cairo_lang_defs::db::{DefsDatabase, DefsGroup};
 use cairo_lang_defs::plugin::{InlineMacroExprPlugin, MacroPlugin};
 use cairo_lang_filesystem::cfg::CfgSet;
 use cairo_lang_filesystem::db::{
     init_dev_corelib, init_files_group, AsFilesGroupMut, FilesDatabase, FilesGroup, FilesGroupEx,
-    CORELIB_CRATE_NAME,
+    CORELIB_CRATE_NAME, CORELIB_VERSION,
 };
 use cairo_lang_filesystem::detect::detect_corelib;
 use cairo_lang_filesystem::flag::Flag;
-use cairo_lang_filesystem::ids::FlagId;
+use cairo_lang_filesystem::ids::{CrateLongId, FlagId};
 use cairo_lang_lowering::db::{init_lowering_group, LoweringDatabase, LoweringGroup};
 use cairo_lang_parser::db::{ParserDatabase, ParserGroup};
 use cairo_lang_project::ProjectConfig;
@@ -20,7 +20,7 @@ use cairo_lang_semantic::plugin::{AnalyzerPlugin, PluginSuite};
 use cairo_lang_sierra_generator::db::SierraGenDatabase;
 use cairo_lang_syntax::node::db::{SyntaxDatabase, SyntaxGroup};
 use cairo_lang_utils::ordered_hash_map::OrderedHashMap;
-use cairo_lang_utils::Upcast;
+use cairo_lang_utils::{Intern, Upcast};
 
 use crate::project::{update_crate_root, update_crate_roots_from_project_config};
 use crate::InliningStrategy;
@@ -170,11 +170,36 @@ impl RootDatabaseBuilder {
                 update_crate_root(&mut db, config, CORELIB_CRATE_NAME.into(), corelib.clone());
             }
         }
+        validate_corelib(&db)?;
 
         Ok(db)
     }
 }
 
+/// Validates that the corelib version matches the expected one.
+fn validate_corelib(db: &RootDatabase) -> Result<()> {
+    let Some(config) = db.crate_config(CrateLongId::Real(CORELIB_CRATE_NAME.into()).intern(db))
+    else {
+        return Ok(());
+    };
+    let Some(found) = config.settings.version else {
+        return Ok(());
+    };
+    let Ok(expected) = semver::Version::parse(CORELIB_VERSION) else {
+        return Ok(());
+    };
+    if found == expected {
+        return Ok(());
+    }
+    let path_part = match config.root {
+        cairo_lang_filesystem::ids::Directory::Real(path) => {
+            format!(" for `{}`", path.to_string_lossy())
+        }
+        cairo_lang_filesystem::ids::Directory::Virtual { .. } => "".to_string(),
+    };
+    bail!("Corelib version mismatch: expected `{expected}`, found `{found}`{path_part}.");
+}
+
 impl AsFilesGroupMut for RootDatabase {
     fn as_files_group_mut(&mut self) -> &mut (dyn FilesGroup + 'static) {
         self

diff --git a/crates/cairo-lang-debug/Cargo.toml b/crates/cairo-lang-debug/Cargo.toml
@@ -7,7 +7,7 @@ license-file.workspace = true
 description = "Debug utilities for query objects."
 
 [dependencies]
-cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" }
+cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" }
 
 [dev-dependencies]
 cairo-lang-proc-macros = { path = "../cairo-lang-proc-macros"}

diff --git a/crates/cairo-lang-defs/Cargo.toml b/crates/cairo-lang-defs/Cargo.toml
@@ -7,12 +7,12 @@ license-file.workspace = true
 description = "Handling of definitions of language items in Cairo."
 
 [dependencies]
-cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.0" }
-cairo-lang-diagnostics = { path = "../cairo-lang-diagnostics", version = "~2.7.0" }
-cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.0" }
-cairo-lang-parser = { path = "../cairo-lang-parser", version = "~2.7.0" }
-cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.7.0" }
-cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" }
+cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.1" }
+cairo-lang-diagnostics = { path = "../cairo-lang-diagnostics", version = "~2.7.1" }
+cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.1" }
+cairo-lang-parser = { path = "../cairo-lang-parser", version = "~2.7.1" }
+cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.7.1" }
+cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" }
 itertools = { workspace = true, default-features = true }
 salsa.workspace = true
 smol_str.workspace = true