diff --git a/Cargo.lock b/Cargo.lock index 7a2470f8577..15c81166700 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -467,7 +467,7 @@ dependencies = [ [[package]] name = "cairo-compile" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -479,7 +479,7 @@ dependencies = [ [[package]] name = "cairo-format" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -491,7 +491,7 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-utils", "env_logger", @@ -509,7 +509,7 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-defs", @@ -526,13 +526,14 @@ dependencies = [ "indoc", "rayon", "salsa", + "semver", "smol_str", "thiserror", ] [[package]] name = "cairo-lang-debug" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-proc-macros", "cairo-lang-utils", @@ -543,7 +544,7 @@ dependencies = [ [[package]] name = "cairo-lang-defs" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -563,7 +564,7 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -577,7 +578,7 @@ dependencies = [ [[package]] name = "cairo-lang-doc" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-defs", "cairo-lang-formatter", @@ -591,7 +592,7 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-utils", "env_logger", @@ -601,13 +602,14 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", "env_logger", "path-clean", "salsa", + "semver", "serde", "serde_json", "smol_str", @@ -616,7 +618,7 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -637,7 +639,7 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "assert_fs", @@ -678,7 +680,7 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -706,7 +708,7 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -728,7 +730,7 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -750,7 +752,7 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-debug", "quote", @@ -759,7 +761,7 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -773,7 +775,7 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.7.0" +version = "2.7.1" dependencies = [ "ark-ff", "ark-secp256k1", @@ -809,7 +811,7 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -837,7 +839,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "bimap", @@ -869,7 +871,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -884,7 +886,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -904,7 +906,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -934,7 +936,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.7.0" +version = "2.7.1" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -958,7 +960,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -966,7 +968,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1000,7 +1002,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1028,7 +1030,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1045,7 +1047,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.7.0" +version = "2.7.1" dependencies = [ "env_logger", "genco", @@ -1055,7 +1057,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1080,7 +1082,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1102,7 +1104,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1115,7 +1117,7 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.7.0" +version = "2.7.1" dependencies = [ "env_logger", "hashbrown 0.14.5", @@ -1135,14 +1137,14 @@ dependencies = [ [[package]] name = "cairo-language-server" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-language-server", ] [[package]] name = "cairo-run" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1155,7 +1157,7 @@ dependencies = [ [[package]] name = "cairo-test" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1166,9 +1168,21 @@ dependencies = [ [[package]] name = "cairo-vm" +<<<<<<< HEAD version = "1.0.0" +||||||| 223ca9963 +version = "1.0.0-rc6" +======= +version = "1.0.1" +>>>>>>> origin/dev-v2.7.1 source = "registry+https://github.com/rust-lang/crates.io-index" +<<<<<<< HEAD checksum = "94a9ff830d1c79b41b146c69ddbf60cfc3765b92fabb5d5126908bdc1b1a9232" +||||||| 223ca9963 +checksum = "f905a936b3287d085706d3d68e405be4844ec7bc1c95eaa3d53220dd33efd4ff" +======= +checksum = "58363ad8065ed891e3b14a8191b707677c7c7cb5b9d10030822506786d8d8108" +>>>>>>> origin/dev-v2.7.1 dependencies = [ "anyhow", "bincode", @@ -1800,7 +1814,7 @@ dependencies = [ [[package]] name = "generate-syntax" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cairo-lang-syntax-codegen", "cairo-lang-utils", @@ -1819,7 +1833,7 @@ dependencies = [ [[package]] name = "get-lowering" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -3553,7 +3567,7 @@ dependencies = [ [[package]] name = "sierra-compile" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-sierra", @@ -3632,7 +3646,7 @@ dependencies = [ [[package]] name = "starknet-compile" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -3695,7 +3709,7 @@ dependencies = [ [[package]] name = "starknet-sierra-compile" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-sierra", @@ -3708,7 +3722,7 @@ dependencies = [ [[package]] name = "starknet-sierra-extract-code" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "cairo-lang-starknet-classes", @@ -3718,7 +3732,7 @@ dependencies = [ [[package]] name = "starknet-sierra-upgrade-validate" -version = "2.7.0" +version = "2.7.1" dependencies = [ "anyhow", "async-channel", @@ -3915,7 +3929,7 @@ dependencies = [ [[package]] name = "tests" -version = "2.7.0" +version = "2.7.1" dependencies = [ "assert_matches", "cairo-lang-casm", diff --git a/Cargo.toml b/Cargo.toml index 896566e883a..3433d7e726c 100644 --- 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 index 051011153c0..62e725dffc2 100644 --- 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 index 1d476297699..a262686b4f4 100644 --- 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 index 1f043d4acef..d249802417b 100644 --- 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() implicits(Implicit) nopanic; extern type index_enum_type; +<<<<<<< HEAD pub(crate) mod bounded_int; +||||||| 223ca9963 +#[derive(Copy, Drop)] +pub(crate) extern type BoundedInt; +impl NumericLiteralBoundedInt< + const MIN: felt252, const MAX: felt252 +> of core::integer::NumericLiteral>; + +impl BoundedIntIntoFelt252< + const MIN: felt252, const MAX: felt252 +> of Into, felt252> { + fn into(self: BoundedInt) -> felt252 { + upcast(self) + } +} + +impl BoundedIntPartialEq< + const MIN: felt252, const MAX: felt252 +> of PartialEq> { + #[inline(always)] + fn eq(lhs: @BoundedInt, rhs: @BoundedInt) -> bool { + Into::<_, felt252>::into(*lhs) == (*rhs).into() + } +} + +impl BoundedIntDebug = + core::fmt::into_felt252_based::DebugImpl>; +======= +#[derive(Copy, Drop)] +pub(crate) extern type BoundedInt; +impl NumericLiteralBoundedInt< + const MIN: felt252, const MAX: felt252 +> of core::integer::NumericLiteral>; + +impl BoundedIntIntoFelt252< + const MIN: felt252, const MAX: felt252 +> of Into, felt252> { + fn into(self: BoundedInt) -> felt252 { + upcast(self) + } +} + +impl Felt252TryIntoBoundedInt< + const MIN: felt252, const MAX: felt252 +> of TryInto> { + fn try_into(self: felt252) -> Option> { + // 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 = + core::serde::into_felt252_based::SerdeImpl>; + +impl BoundedIntPartialEq< + const MIN: felt252, const MAX: felt252 +> of PartialEq> { + #[inline(always)] + fn eq(lhs: @BoundedInt, rhs: @BoundedInt) -> bool { + Into::<_, felt252>::into(*lhs) == (*rhs).into() + } +} + +impl BoundedIntDebug = + core::fmt::into_felt252_based::DebugImpl>; +>>>>>>> origin/dev-v2.7.1 diff --git a/crates/bin/cairo-compile/Cargo.toml b/crates/bin/cairo-compile/Cargo.toml index 87569afc633..ba4368c8e7b 100644 --- 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 index f43ecf869c1..14e7fc2b7d0 100644 --- 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 index ae33ff0b380..5c5a4f17949 100644 --- 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 index e0ba026c6eb..27037b4c8c4 100644 --- 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 index b88f2556d33..5f8699cb37c 100644 --- 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 index a1a3789e7d3..bf48c64246b 100644 --- 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 index 0bc706b0d64..21b6e05bf8a 100644 --- 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 index 2fb5c3aeea5..bb229fc31a0 100644 --- 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 index 6ec04d7c0d0..3cab0c4f124 100644 --- 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 index 6d2ab29b5b7..0c0bf8b9cf7 100644 --- 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 index 315a274242d..899109dd8d8 100644 --- 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 index 8d7a0920c41..b0fd8b7fa1c 100644 --- 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 index 26719c9bedc..69a2d767b81 100644 --- 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 index 7345af46fa6..f8272edb5b4 100644 --- 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 index f139bd92c15..9ea7b152eb0 100644 --- 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 index ea4f767c632..ff1e2528405 100644 --- 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 index cf2d73b1844..2172982ede4 100644 --- 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 diff --git a/crates/cairo-lang-diagnostics/Cargo.toml b/crates/cairo-lang-diagnostics/Cargo.toml index a66a2968695..7fe1df95654 100644 --- a/crates/cairo-lang-diagnostics/Cargo.toml +++ b/crates/cairo-lang-diagnostics/Cargo.toml @@ -7,9 +7,9 @@ license-file.workspace = true description = "Diagnostic utilities." [dependencies] -cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.0" } -cairo-lang-filesystem = { path = "../cairo-lang-filesystem", 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-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } itertools = { workspace = true, default-features = true } [dev-dependencies] diff --git a/crates/cairo-lang-doc/Cargo.toml b/crates/cairo-lang-doc/Cargo.toml index 606974d75dd..839c5b82893 100644 --- a/crates/cairo-lang-doc/Cargo.toml +++ b/crates/cairo-lang-doc/Cargo.toml @@ -7,11 +7,11 @@ license-file.workspace = true description = "A collection of documentation processing utilities for the Cairo programming language." [dependencies] -cairo-lang-defs = { path = "../cairo-lang-defs", version = "~2.7.0" } -cairo-lang-formatter = { path = "../cairo-lang-formatter", 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-defs = { path = "../cairo-lang-defs", version = "~2.7.1" } +cairo-lang-formatter = { path = "../cairo-lang-formatter", 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" } salsa.workspace = true itertools.workspace = true diff --git a/crates/cairo-lang-eq-solver/Cargo.toml b/crates/cairo-lang-eq-solver/Cargo.toml index 35736b3e1e6..461237fc2ce 100644 --- a/crates/cairo-lang-eq-solver/Cargo.toml +++ b/crates/cairo-lang-eq-solver/Cargo.toml @@ -7,7 +7,7 @@ license-file.workspace = true description = "Equation solving for Sierra generation." [dependencies] -cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } good_lp.workspace = true [dev-dependencies] diff --git a/crates/cairo-lang-filesystem/Cargo.toml b/crates/cairo-lang-filesystem/Cargo.toml index 7ab314e5a12..4d260e05e14 100644 --- a/crates/cairo-lang-filesystem/Cargo.toml +++ b/crates/cairo-lang-filesystem/Cargo.toml @@ -7,10 +7,11 @@ license-file.workspace = true description = "Virtual filesystem for the compiler." [dependencies] -cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.0" } -cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0", features = ["serde"] } +cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1", features = ["serde"] } path-clean.workspace = true salsa.workspace = true +semver.workspace = true serde = { workspace = true, default-features = true } smol_str.workspace = true diff --git a/crates/cairo-lang-filesystem/src/db.rs b/crates/cairo-lang-filesystem/src/db.rs index 31bd135662f..08b9eede342 100644 --- a/crates/cairo-lang-filesystem/src/db.rs +++ b/crates/cairo-lang-filesystem/src/db.rs @@ -4,6 +4,7 @@ use std::sync::Arc; use cairo_lang_utils::ordered_hash_map::OrderedHashMap; use cairo_lang_utils::{Intern, LookupIntern, Upcast}; +use semver::Version; use serde::{Deserialize, Serialize}; use crate::cfg::CfgSet; @@ -18,6 +19,7 @@ use crate::span::{FileSummary, TextOffset, TextSpan, TextWidth}; mod test; pub const CORELIB_CRATE_NAME: &str = "core"; +pub const CORELIB_VERSION: &str = env!("CARGO_PKG_VERSION"); /// A configuration per crate. #[derive(Clone, Debug, Hash, PartialEq, Eq)] @@ -38,6 +40,8 @@ impl CrateConfiguration { pub struct CrateSettings { /// The crate's Cairo edition. pub edition: Edition, + /// The crate's version. + pub version: Option, pub cfg_set: Option, @@ -164,6 +168,7 @@ pub fn init_dev_corelib(db: &mut (dyn FilesGroup + 'static), core_lib_dir: PathB root: Directory::Real(core_lib_dir), settings: CrateSettings { edition: Edition::V2024_07, + version: Version::parse(CORELIB_VERSION).ok(), cfg_set: Default::default(), experimental_features: ExperimentalFeaturesConfig { negative_impls: true, diff --git a/crates/cairo-lang-formatter/Cargo.toml b/crates/cairo-lang-formatter/Cargo.toml index 62cefd8c64b..0beb129fc94 100644 --- a/crates/cairo-lang-formatter/Cargo.toml +++ b/crates/cairo-lang-formatter/Cargo.toml @@ -8,11 +8,11 @@ description = "Cairo formatter." [dependencies] anyhow.workspace = true -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-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" } diffy.workspace = true ignore.workspace = true itertools = { workspace = true, default-features = true } diff --git a/crates/cairo-lang-language-server/Cargo.toml b/crates/cairo-lang-language-server/Cargo.toml index 9fa59340054..c658d700f73 100644 --- a/crates/cairo-lang-language-server/Cargo.toml +++ b/crates/cairo-lang-language-server/Cargo.toml @@ -11,6 +11,7 @@ testing = [] [dependencies] anyhow.workspace = true +<<<<<<< HEAD cairo-lang-compiler = { path = "../cairo-lang-compiler", version = "~2.7.0" } cairo-lang-defs = { path = "../cairo-lang-defs", version = "~2.7.0" } cairo-lang-diagnostics = { path = "../cairo-lang-diagnostics", version = "~2.7.0" } @@ -27,6 +28,37 @@ cairo-lang-test-plugin = { path = "../cairo-lang-test-plugin", version = "~2.7.0 cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" } indent.workspace = true indoc.workspace = true +||||||| 223ca9963 +cairo-lang-compiler = { path = "../cairo-lang-compiler", version = "~2.7.0" } +cairo-lang-defs = { path = "../cairo-lang-defs", version = "~2.7.0" } +cairo-lang-diagnostics = { path = "../cairo-lang-diagnostics", version = "~2.7.0" } +cairo-lang-doc = { path = "../cairo-lang-doc", version = "~2.7.0" } +cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.0" } +cairo-lang-formatter = { path = "../cairo-lang-formatter", 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" } +cairo-lang-starknet = { path = "../cairo-lang-starknet", version = "~2.7.0" } +cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.7.0" } +cairo-lang-test-plugin = { path = "../cairo-lang-test-plugin", 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-defs = { path = "../cairo-lang-defs", version = "~2.7.1" } +cairo-lang-diagnostics = { path = "../cairo-lang-diagnostics", version = "~2.7.1" } +cairo-lang-doc = { path = "../cairo-lang-doc", version = "~2.7.1" } +cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.1" } +cairo-lang-formatter = { path = "../cairo-lang-formatter", 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" } +cairo-lang-starknet = { path = "../cairo-lang-starknet", version = "~2.7.1" } +cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.7.1" } +cairo-lang-test-plugin = { path = "../cairo-lang-test-plugin", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } +>>>>>>> origin/dev-v2.7.1 itertools.workspace = true salsa.workspace = true scarb-metadata = "1.12" diff --git a/crates/cairo-lang-language-server/src/lang/db/syntax.rs b/crates/cairo-lang-language-server/src/lang/db/syntax.rs index a8f1d730fc4..f5a779a92ad 100644 --- a/crates/cairo-lang-language-server/src/lang/db/syntax.rs +++ b/crates/cairo-lang-language-server/src/lang/db/syntax.rs @@ -51,6 +51,7 @@ pub trait LsSyntaxGroup: Upcast { find(TextPosition { col, ..position }) }) } +<<<<<<< HEAD /// Traverse tree in root direction. /// @@ -78,6 +79,24 @@ pub trait LsSyntaxGroup: Upcast { fn first_ancestor_of_kind(&self, node: SyntaxNode, kind: SyntaxKind) -> Option { self.first_ancestor_of_kind_respective_child(node, kind).and_then(|node| node.parent()) } +||||||| 223ca9963 +======= + + /// Finds first ancestor of a given kind. + fn first_ancestor_of_kind(&self, mut node: SyntaxNode, kind: SyntaxKind) -> Option { + let db = self.upcast(); + let syntax_db = db.upcast(); + + while let Some(parent) = node.parent() { + if parent.kind(syntax_db) == kind { + return Some(parent); + } else { + node = parent; + } + } + None + } +>>>>>>> origin/dev-v2.7.1 } impl LsSyntaxGroup for T where T: Upcast + ?Sized {} diff --git a/crates/cairo-lang-language-server/src/project/scarb.rs b/crates/cairo-lang-language-server/src/project/scarb.rs index cfe39a3b0fc..e4c342a8a07 100644 --- a/crates/cairo-lang-language-server/src/project/scarb.rs +++ b/crates/cairo-lang-language-server/src/project/scarb.rs @@ -51,6 +51,7 @@ pub fn update_crate_roots(metadata: &Metadata, db: &mut AnalysisDatabase) { let settings = CrateSettings { edition: scarb_package_edition(&package, crate_name), + version: package.map(|p| p.version.clone()), cfg_set: scarb_cfg_set_to_cairo( component.cfg.as_ref().unwrap_or(&compilation_unit.cfg), crate_name, diff --git a/crates/cairo-lang-lowering/Cargo.toml b/crates/cairo-lang-lowering/Cargo.toml index 68e3f0628e7..a3dda791829 100644 --- a/crates/cairo-lang-lowering/Cargo.toml +++ b/crates/cairo-lang-lowering/Cargo.toml @@ -7,15 +7,15 @@ license-file.workspace = true description = "Cairo lowering phase." [dependencies] -cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.0" } -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-parser = { path = "../cairo-lang-parser", version = "~2.7.0" } -cairo-lang-proc-macros = { path = "../cairo-lang-proc-macros", version = "~2.7.0" } -cairo-lang-semantic = { path = "../cairo-lang-semantic", 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-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-parser = { path = "../cairo-lang-parser", version = "~2.7.1" } +cairo-lang-proc-macros = { path = "../cairo-lang-proc-macros", version = "~2.7.1" } +cairo-lang-semantic = { path = "../cairo-lang-semantic", 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" } id-arena.workspace = true itertools = { workspace = true, default-features = true } log.workspace = true diff --git a/crates/cairo-lang-parser/Cargo.toml b/crates/cairo-lang-parser/Cargo.toml index 72f104a91a4..8edfe8ba6cf 100644 --- a/crates/cairo-lang-parser/Cargo.toml +++ b/crates/cairo-lang-parser/Cargo.toml @@ -7,11 +7,11 @@ license-file.workspace = true description = "Cairo parser." [dependencies] -cairo-lang-diagnostics = { path = "../cairo-lang-diagnostics", version = "~2.7.0" } -cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.0" } -cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.7.0" } -cairo-lang-syntax-codegen = { path = "../cairo-lang-syntax-codegen", version = "~2.7.0" } -cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" } +cairo-lang-diagnostics = { path = "../cairo-lang-diagnostics", version = "~2.7.1" } +cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.1" } +cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.7.1" } +cairo-lang-syntax-codegen = { path = "../cairo-lang-syntax-codegen", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } colored.workspace = true itertools = { workspace = true, default-features = true } num-bigint = { workspace = true, default-features = true } diff --git a/crates/cairo-lang-plugins/Cargo.toml b/crates/cairo-lang-plugins/Cargo.toml index 3952eeeb997..5f6fb32e943 100644 --- a/crates/cairo-lang-plugins/Cargo.toml +++ b/crates/cairo-lang-plugins/Cargo.toml @@ -10,12 +10,12 @@ description = "Cairo core plugin implementations." testing = [] [dependencies] -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-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-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-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" } indent.workspace = true indoc.workspace = true itertools = { workspace = true, default-features = true } diff --git a/crates/cairo-lang-proc-macros/Cargo.toml b/crates/cairo-lang-proc-macros/Cargo.toml index 726ccb5ba54..f8d2d44a04d 100644 --- a/crates/cairo-lang-proc-macros/Cargo.toml +++ b/crates/cairo-lang-proc-macros/Cargo.toml @@ -17,6 +17,6 @@ normal = ["cairo-lang-debug"] [dependencies] # This is used only for docs. -cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.0" } +cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.1" } quote.workspace = true syn.workspace = true diff --git a/crates/cairo-lang-project/Cargo.toml b/crates/cairo-lang-project/Cargo.toml index b00560a61d8..6ebae544963 100644 --- a/crates/cairo-lang-project/Cargo.toml +++ b/crates/cairo-lang-project/Cargo.toml @@ -7,8 +7,8 @@ license-file.workspace = true description = "Cairo project specification. For example, crates and flags used for compilation." [dependencies] -cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.0" } -cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" } +cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } serde = { workspace = true, default-features = true } smol_str.workspace = true thiserror.workspace = true diff --git a/crates/cairo-lang-project/src/test.rs b/crates/cairo-lang-project/src/test.rs index 45af138b9c3..364f2e38e5e 100644 --- a/crates/cairo-lang-project/src/test.rs +++ b/crates/cairo-lang-project/src/test.rs @@ -17,6 +17,7 @@ fn test_serde() { crates_config: AllCratesConfig { global: CrateSettings { edition: Default::default(), + version: Default::default(), experimental_features: ExperimentalFeaturesConfig::default(), cfg_set: Default::default(), }, @@ -25,6 +26,7 @@ fn test_serde() { "crate1".into(), CrateSettings { edition: Edition::V2023_10, + version: Default::default(), experimental_features: ExperimentalFeaturesConfig::default(), cfg_set: Default::default(), }, @@ -33,6 +35,7 @@ fn test_serde() { "crate3".into(), CrateSettings { edition: Default::default(), + version: Default::default(), experimental_features: ExperimentalFeaturesConfig { negative_impls: true, coupons: false, diff --git a/crates/cairo-lang-runner/Cargo.toml b/crates/cairo-lang-runner/Cargo.toml index bd18d59e5fd..ed0e74a0f17 100644 --- a/crates/cairo-lang-runner/Cargo.toml +++ b/crates/cairo-lang-runner/Cargo.toml @@ -11,15 +11,15 @@ ark-ff.workspace = true ark-secp256k1.workspace = true ark-secp256r1.workspace = true -cairo-lang-casm = { path = "../cairo-lang-casm", version = "~2.7.0" } -cairo-lang-lowering = { path = "../cairo-lang-lowering", version = "~2.7.0" } -cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.0" } -cairo-lang-sierra-ap-change = { path = "../cairo-lang-sierra-ap-change", version = "~2.7.0" } -cairo-lang-sierra-generator = { path = "../cairo-lang-sierra-generator", version = "~2.7.0" } -cairo-lang-sierra-to-casm = { path = "../cairo-lang-sierra-to-casm", version = "~2.7.0" } -cairo-lang-sierra-type-size = { path = "../cairo-lang-sierra-type-size", version = "~2.7.0" } -cairo-lang-starknet = { path = "../cairo-lang-starknet", version = "~2.7.0" } -cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" } +cairo-lang-casm = { path = "../cairo-lang-casm", version = "~2.7.1" } +cairo-lang-lowering = { path = "../cairo-lang-lowering", version = "~2.7.1" } +cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.1" } +cairo-lang-sierra-ap-change = { path = "../cairo-lang-sierra-ap-change", version = "~2.7.1" } +cairo-lang-sierra-generator = { path = "../cairo-lang-sierra-generator", version = "~2.7.1" } +cairo-lang-sierra-to-casm = { path = "../cairo-lang-sierra-to-casm", version = "~2.7.1" } +cairo-lang-sierra-type-size = { path = "../cairo-lang-sierra-type-size", version = "~2.7.1" } +cairo-lang-starknet = { path = "../cairo-lang-starknet", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } cairo-vm.workspace = true itertools = { workspace = true, default-features = true } keccak.workspace = true diff --git a/crates/cairo-lang-semantic/Cargo.toml b/crates/cairo-lang-semantic/Cargo.toml index 77da3a378c5..15845ba0938 100644 --- a/crates/cairo-lang-semantic/Cargo.toml +++ b/crates/cairo-lang-semantic/Cargo.toml @@ -10,16 +10,16 @@ description = "Cairo semantic model." testing = ["dep:cairo-lang-test-utils", "dep:toml"] [dependencies] -cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.0" } -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-parser = { path = "../cairo-lang-parser", version = "~2.7.0" } -cairo-lang-plugins = { path = "../cairo-lang-plugins", version = "~2.7.0" } -cairo-lang-proc-macros = { path = "../cairo-lang-proc-macros", 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-test-utils = { path = "../cairo-lang-test-utils", version = "~2.7.0", optional = true, features = ["testing"] } +cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.1" } +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-parser = { path = "../cairo-lang-parser", version = "~2.7.1" } +cairo-lang-plugins = { path = "../cairo-lang-plugins", version = "~2.7.1" } +cairo-lang-proc-macros = { path = "../cairo-lang-proc-macros", 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" } +cairo-lang-test-utils = { path = "../cairo-lang-test-utils", version = "~2.7.1", optional = true, features = ["testing"] } id-arena.workspace = true indoc.workspace = true itertools = { workspace = true, default-features = true } diff --git a/crates/cairo-lang-semantic/src/test_utils.rs b/crates/cairo-lang-semantic/src/test_utils.rs index 798564bd37f..2baaa01e52a 100644 --- a/crates/cairo-lang-semantic/src/test_utils.rs +++ b/crates/cairo-lang-semantic/src/test_utils.rs @@ -138,6 +138,7 @@ pub fn setup_test_crate_ex( } else { CrateSettings { edition: Edition::default(), + version: None, experimental_features: ExperimentalFeaturesConfig { negative_impls: true, coupons: true, diff --git a/crates/cairo-lang-sierra-ap-change/Cargo.toml b/crates/cairo-lang-sierra-ap-change/Cargo.toml index bc673cda7f8..bab8cff8ec2 100644 --- a/crates/cairo-lang-sierra-ap-change/Cargo.toml +++ b/crates/cairo-lang-sierra-ap-change/Cargo.toml @@ -7,10 +7,10 @@ license-file.workspace = true description = "Sierra AP change computation." [dependencies] -cairo-lang-eq-solver = { path = "../cairo-lang-eq-solver", version = "~2.7.0" } -cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.0" } -cairo-lang-sierra-type-size = { path = "../cairo-lang-sierra-type-size", version = "~2.7.0" } -cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" } +cairo-lang-eq-solver = { path = "../cairo-lang-eq-solver", version = "~2.7.1" } +cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.1" } +cairo-lang-sierra-type-size = { path = "../cairo-lang-sierra-type-size", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } itertools = { workspace = true, default-features = true } thiserror.workspace = true num-bigint = { workspace = true } diff --git a/crates/cairo-lang-sierra-gas/Cargo.toml b/crates/cairo-lang-sierra-gas/Cargo.toml index 866f237fcf1..de633b6d80a 100644 --- a/crates/cairo-lang-sierra-gas/Cargo.toml +++ b/crates/cairo-lang-sierra-gas/Cargo.toml @@ -7,10 +7,10 @@ license-file.workspace = true description = "Sierra gas computation." [dependencies] -cairo-lang-eq-solver = { path = "../cairo-lang-eq-solver", version = "~2.7.0" } -cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.0" } -cairo-lang-sierra-type-size = { path = "../cairo-lang-sierra-type-size", version = "~2.7.0" } -cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" } +cairo-lang-eq-solver = { path = "../cairo-lang-eq-solver", version = "~2.7.1" } +cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.1" } +cairo-lang-sierra-type-size = { path = "../cairo-lang-sierra-type-size", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } itertools = { workspace = true, default-features = true } thiserror.workspace = true num-bigint = { workspace = true } diff --git a/crates/cairo-lang-sierra-generator/Cargo.toml b/crates/cairo-lang-sierra-generator/Cargo.toml index 4084ce222f1..b07de5c833d 100644 --- a/crates/cairo-lang-sierra-generator/Cargo.toml +++ b/crates/cairo-lang-sierra-generator/Cargo.toml @@ -10,17 +10,17 @@ description = "Sierra code generation from lowered Cairo representation." testing = ["dep:cairo-lang-test-utils"] [dependencies] -cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.0" } -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-semantic = { path = "../cairo-lang-semantic", version = "~2.7.0" } -cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.0" } -cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.7.0" } -cairo-lang-test-utils = { path = "../cairo-lang-test-utils", version = "~2.7.0", optional = true, features = ["testing"] } -cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" } +cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.1" } +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-semantic = { path = "../cairo-lang-semantic", version = "~2.7.1" } +cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.1" } +cairo-lang-syntax = { path = "../cairo-lang-syntax", version = "~2.7.1" } +cairo-lang-test-utils = { path = "../cairo-lang-test-utils", version = "~2.7.1", optional = true, features = ["testing"] } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } itertools = { workspace = true, default-features = true } num-traits = { workspace = true } salsa.workspace = true diff --git a/crates/cairo-lang-sierra-to-casm/Cargo.toml b/crates/cairo-lang-sierra-to-casm/Cargo.toml index 0d3037046ac..d253814741a 100644 --- a/crates/cairo-lang-sierra-to-casm/Cargo.toml +++ b/crates/cairo-lang-sierra-to-casm/Cargo.toml @@ -8,12 +8,12 @@ description = "Emitting of CASM instructions from Sierra code." [dependencies] assert_matches.workspace = true -cairo-lang-casm = { path = "../cairo-lang-casm", version = "~2.7.0" } -cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.0" } -cairo-lang-sierra-ap-change = { path = "../cairo-lang-sierra-ap-change", version = "~2.7.0" } -cairo-lang-sierra-gas = { path = "../cairo-lang-sierra-gas", version = "~2.7.0" } -cairo-lang-sierra-type-size = { path = "../cairo-lang-sierra-type-size", version = "~2.7.0" } -cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0", features = ["serde"] } +cairo-lang-casm = { path = "../cairo-lang-casm", version = "~2.7.1" } +cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.1" } +cairo-lang-sierra-ap-change = { path = "../cairo-lang-sierra-ap-change", version = "~2.7.1" } +cairo-lang-sierra-gas = { path = "../cairo-lang-sierra-gas", version = "~2.7.1" } +cairo-lang-sierra-type-size = { path = "../cairo-lang-sierra-type-size", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1", features = ["serde"] } indoc.workspace = true itertools = { workspace = true, default-features = true } starknet-types-core.workspace = true diff --git a/crates/cairo-lang-sierra-type-size/Cargo.toml b/crates/cairo-lang-sierra-type-size/Cargo.toml index 27b6ff79ced..9fb917fa44e 100644 --- a/crates/cairo-lang-sierra-type-size/Cargo.toml +++ b/crates/cairo-lang-sierra-type-size/Cargo.toml @@ -7,5 +7,5 @@ license-file.workspace = true description = "Sierra type sizes computation." [dependencies] -cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.0" } -cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" } +cairo-lang-sierra = { path = "../cairo-lang-sierra", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } diff --git a/crates/cairo-lang-sierra/Cargo.toml b/crates/cairo-lang-sierra/Cargo.toml index b78ba752bac..c2fade0cc1b 100644 --- a/crates/cairo-lang-sierra/Cargo.toml +++ b/crates/cairo-lang-sierra/Cargo.toml @@ -13,7 +13,7 @@ regex = "1" [dependencies] anyhow.workspace = true -cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0", features = ["serde", "schemars"] } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1", features = ["serde", "schemars"] } const-fnv1a-hash.workspace = true convert_case.workspace = true derivative.workspace = true diff --git a/crates/cairo-lang-starknet-classes/Cargo.toml b/crates/cairo-lang-starknet-classes/Cargo.toml index 510ae698f9c..6e5df2bf061 100644 --- a/crates/cairo-lang-starknet-classes/Cargo.toml +++ b/crates/cairo-lang-starknet-classes/Cargo.toml @@ -7,10 +7,10 @@ license-file.workspace = true description = "Starknet definitions for contract classes." [dependencies] -cairo-lang-casm = { path = "../cairo-lang-casm", version = "~2.7.0", default-features = true, features = ["serde"] } -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" } +cairo-lang-casm = { path = "../cairo-lang-casm", version = "~2.7.1", default-features = true, features = ["serde"] } +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" } convert_case.workspace = true itertools = { workspace = true, default-features = true } num-bigint = { workspace = true, default-features = true } diff --git a/crates/cairo-lang-starknet/Cargo.toml b/crates/cairo-lang-starknet/Cargo.toml index f456d16b278..052ab8c3754 100644 --- a/crates/cairo-lang-starknet/Cargo.toml +++ b/crates/cairo-lang-starknet/Cargo.toml @@ -8,18 +8,18 @@ description = "Starknet capabilities and utilities on top of Cairo." [dependencies] anyhow.workspace = true -cairo-lang-compiler = { path = "../cairo-lang-compiler", version = "~2.7.0" } -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-plugins = { path = "../cairo-lang-plugins", version = "~2.7.0" } -cairo-lang-semantic = { path = "../cairo-lang-semantic", version = "~2.7.0" } -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-starknet-classes = { path = "../cairo-lang-starknet-classes", 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", features = ["serde"] } +cairo-lang-compiler = { path = "../cairo-lang-compiler", version = "~2.7.1" } +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-plugins = { path = "../cairo-lang-plugins", version = "~2.7.1" } +cairo-lang-semantic = { path = "../cairo-lang-semantic", version = "~2.7.1" } +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-starknet-classes = { path = "../cairo-lang-starknet-classes", 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", features = ["serde"] } const_format.workspace = true indoc.workspace = true itertools = { workspace = true, default-features = true } diff --git a/crates/cairo-lang-starknet/test_data/account__account.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/account__account.compiled_contract_class.json index 4d712670e5f..8151f13b348 100644 --- a/crates/cairo-lang-starknet/test_data/account__account.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/account__account.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/account__account.contract_class.json b/crates/cairo-lang-starknet/test_data/account__account.contract_class.json index bf3474247eb..b467449484d 100644 --- a/crates/cairo-lang-starknet/test_data/account__account.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/account__account.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x1e0", "0x20", "0x59", diff --git a/crates/cairo-lang-starknet/test_data/circuit_contract__circuit_contract.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/circuit_contract__circuit_contract.compiled_contract_class.json index b8cd4343bb7..c0c16e78e80 100644 --- a/crates/cairo-lang-starknet/test_data/circuit_contract__circuit_contract.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/circuit_contract__circuit_contract.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/circuit_contract__circuit_contract.contract_class.json b/crates/cairo-lang-starknet/test_data/circuit_contract__circuit_contract.contract_class.json index 56097777467..d7d004a196c 100644 --- a/crates/cairo-lang-starknet/test_data/circuit_contract__circuit_contract.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/circuit_contract__circuit_contract.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0xc7", "0x39", "0x49", diff --git a/crates/cairo-lang-starknet/test_data/erc20__erc_20.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/erc20__erc_20.compiled_contract_class.json index c94046a07a1..f7a1aad5cee 100644 --- a/crates/cairo-lang-starknet/test_data/erc20__erc_20.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/erc20__erc_20.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/erc20__erc_20.contract_class.json b/crates/cairo-lang-starknet/test_data/erc20__erc_20.contract_class.json index ce45eba7a50..193be98fc57 100644 --- a/crates/cairo-lang-starknet/test_data/erc20__erc_20.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/erc20__erc_20.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x302", "0xfe", "0x53", diff --git a/crates/cairo-lang-starknet/test_data/hello_starknet__hello_starknet.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/hello_starknet__hello_starknet.compiled_contract_class.json index a9400f49308..0c17b22d920 100644 --- a/crates/cairo-lang-starknet/test_data/hello_starknet__hello_starknet.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/hello_starknet__hello_starknet.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/hello_starknet__hello_starknet.contract_class.json b/crates/cairo-lang-starknet/test_data/hello_starknet__hello_starknet.contract_class.json index ada82bc2e48..09bc44d48b7 100644 --- a/crates/cairo-lang-starknet/test_data/hello_starknet__hello_starknet.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/hello_starknet__hello_starknet.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0xa2", "0x5e", "0x1d", diff --git a/crates/cairo-lang-starknet/test_data/minimal_contract__minimal_contract.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/minimal_contract__minimal_contract.compiled_contract_class.json index e841c3b8fa4..779b0185e2d 100644 --- a/crates/cairo-lang-starknet/test_data/minimal_contract__minimal_contract.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/minimal_contract__minimal_contract.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/minimal_contract__minimal_contract.contract_class.json b/crates/cairo-lang-starknet/test_data/minimal_contract__minimal_contract.contract_class.json index 7d6721949ec..45024dc187b 100644 --- a/crates/cairo-lang-starknet/test_data/minimal_contract__minimal_contract.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/minimal_contract__minimal_contract.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x54", "0xac", "0xf", diff --git a/crates/cairo-lang-starknet/test_data/mintable__mintable_erc20_ownable.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/mintable__mintable_erc20_ownable.compiled_contract_class.json index 2dcde1129b7..3c17d55037b 100644 --- a/crates/cairo-lang-starknet/test_data/mintable__mintable_erc20_ownable.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/mintable__mintable_erc20_ownable.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/mintable__mintable_erc20_ownable.contract_class.json b/crates/cairo-lang-starknet/test_data/mintable__mintable_erc20_ownable.contract_class.json index 0cab025de96..cbabf8e00ec 100644 --- a/crates/cairo-lang-starknet/test_data/mintable__mintable_erc20_ownable.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/mintable__mintable_erc20_ownable.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x392", "0x6e", "0x67", diff --git a/crates/cairo-lang-starknet/test_data/multi_component__contract_with_4_components.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/multi_component__contract_with_4_components.compiled_contract_class.json index e19a76e9bfa..b03dff72765 100644 --- a/crates/cairo-lang-starknet/test_data/multi_component__contract_with_4_components.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/multi_component__contract_with_4_components.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/multi_component__contract_with_4_components.contract_class.json b/crates/cairo-lang-starknet/test_data/multi_component__contract_with_4_components.contract_class.json index 67c5124518d..768a106263c 100644 --- a/crates/cairo-lang-starknet/test_data/multi_component__contract_with_4_components.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/multi_component__contract_with_4_components.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x3a1", "0x5f", "0x74", diff --git a/crates/cairo-lang-starknet/test_data/new_syntax_test_contract__counter_contract.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/new_syntax_test_contract__counter_contract.compiled_contract_class.json index 1b5884aa234..46006ec0dfa 100644 --- a/crates/cairo-lang-starknet/test_data/new_syntax_test_contract__counter_contract.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/new_syntax_test_contract__counter_contract.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/new_syntax_test_contract__counter_contract.contract_class.json b/crates/cairo-lang-starknet/test_data/new_syntax_test_contract__counter_contract.contract_class.json index d90f462db05..bd64449a779 100644 --- a/crates/cairo-lang-starknet/test_data/new_syntax_test_contract__counter_contract.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/new_syntax_test_contract__counter_contract.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x127", "0xd9", "0x31", diff --git a/crates/cairo-lang-starknet/test_data/ownable_erc20__ownable_erc20_contract.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/ownable_erc20__ownable_erc20_contract.compiled_contract_class.json index 07bceedfcc6..4f5bf807a6d 100644 --- a/crates/cairo-lang-starknet/test_data/ownable_erc20__ownable_erc20_contract.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/ownable_erc20__ownable_erc20_contract.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/ownable_erc20__ownable_erc20_contract.contract_class.json b/crates/cairo-lang-starknet/test_data/ownable_erc20__ownable_erc20_contract.contract_class.json index bc0cf5afb0e..36bbaf9312d 100644 --- a/crates/cairo-lang-starknet/test_data/ownable_erc20__ownable_erc20_contract.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/ownable_erc20__ownable_erc20_contract.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x339", "0xc7", "0x5e", diff --git a/crates/cairo-lang-starknet/test_data/storage_accesses__storage_accesses.contract_class.json b/crates/cairo-lang-starknet/test_data/storage_accesses__storage_accesses.contract_class.json index 83517f7af79..91ba0f26b19 100644 --- a/crates/cairo-lang-starknet/test_data/storage_accesses__storage_accesses.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/storage_accesses__storage_accesses.contract_class.json @@ -5,9 +5,19 @@ "0x0", "0x2", "0x7", +<<<<<<< HEAD "0x0", "0x271", "0x18f", +||||||| 223ca9963 + "0x0", + "0x275", + "0x18b", +======= + "0x1", + "0x275", + "0x18b", +>>>>>>> origin/dev-v2.7.1 "0x59", "0x52616e6765436865636b", "0x800000000000000100000000000000000000000000000000", diff --git a/crates/cairo-lang-starknet/test_data/test_contract__test_contract.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/test_contract__test_contract.compiled_contract_class.json index 779b3e01664..0d4730c2326 100644 --- a/crates/cairo-lang-starknet/test_data/test_contract__test_contract.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/test_contract__test_contract.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/test_contract__test_contract.contract_class.json b/crates/cairo-lang-starknet/test_data/test_contract__test_contract.contract_class.json index 876452a6da9..94183da03e3 100644 --- a/crates/cairo-lang-starknet/test_data/test_contract__test_contract.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/test_contract__test_contract.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x14d", "0xb3", "0x31", diff --git a/crates/cairo-lang-starknet/test_data/token_bridge__token_bridge.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/token_bridge__token_bridge.compiled_contract_class.json index 4306d264d58..5a030ac62c4 100644 --- a/crates/cairo-lang-starknet/test_data/token_bridge__token_bridge.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/token_bridge__token_bridge.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/token_bridge__token_bridge.contract_class.json b/crates/cairo-lang-starknet/test_data/token_bridge__token_bridge.contract_class.json index b6599f0923e..dc732e88075 100644 --- a/crates/cairo-lang-starknet/test_data/token_bridge__token_bridge.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/token_bridge__token_bridge.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x1b8", "0x48", "0x4c", diff --git a/crates/cairo-lang-starknet/test_data/upgradable_counter__counter_contract.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/upgradable_counter__counter_contract.compiled_contract_class.json index 8f3e8da5a68..00ff5218e53 100644 --- a/crates/cairo-lang-starknet/test_data/upgradable_counter__counter_contract.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/upgradable_counter__counter_contract.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/upgradable_counter__counter_contract.contract_class.json b/crates/cairo-lang-starknet/test_data/upgradable_counter__counter_contract.contract_class.json index e1ccb1afe18..6e821d66022 100644 --- a/crates/cairo-lang-starknet/test_data/upgradable_counter__counter_contract.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/upgradable_counter__counter_contract.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x15e", "0xa2", "0x45", diff --git a/crates/cairo-lang-starknet/test_data/with_erc20__erc20_contract.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/with_erc20__erc20_contract.compiled_contract_class.json index ac947d37d81..f9eee700300 100644 --- a/crates/cairo-lang-starknet/test_data/with_erc20__erc20_contract.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/with_erc20__erc20_contract.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/with_erc20__erc20_contract.contract_class.json b/crates/cairo-lang-starknet/test_data/with_erc20__erc20_contract.contract_class.json index 9ec6fba14e0..abf860a1dac 100644 --- a/crates/cairo-lang-starknet/test_data/with_erc20__erc20_contract.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/with_erc20__erc20_contract.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x308", "0xf8", "0x55", diff --git a/crates/cairo-lang-starknet/test_data/with_erc20_mini__erc20_mini_contract.contract_class.json b/crates/cairo-lang-starknet/test_data/with_erc20_mini__erc20_mini_contract.contract_class.json index 9251d6d4ba6..a3ba930fbba 100644 --- a/crates/cairo-lang-starknet/test_data/with_erc20_mini__erc20_mini_contract.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/with_erc20_mini__erc20_mini_contract.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x293", "0x16d", "0x54", diff --git a/crates/cairo-lang-starknet/test_data/with_ownable__ownable_balance.compiled_contract_class.json b/crates/cairo-lang-starknet/test_data/with_ownable__ownable_balance.compiled_contract_class.json index afb89581075..a2093a85698 100644 --- a/crates/cairo-lang-starknet/test_data/with_ownable__ownable_balance.compiled_contract_class.json +++ b/crates/cairo-lang-starknet/test_data/with_ownable__ownable_balance.compiled_contract_class.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.0", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/cairo-lang-starknet/test_data/with_ownable__ownable_balance.contract_class.json b/crates/cairo-lang-starknet/test_data/with_ownable__ownable_balance.contract_class.json index 4371a9bb43e..fb3ff14c1a6 100644 --- a/crates/cairo-lang-starknet/test_data/with_ownable__ownable_balance.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/with_ownable__ownable_balance.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0xfe", "0x2", "0x2e", diff --git a/crates/cairo-lang-starknet/test_data/with_ownable_mini__ownable_mini_contract.contract_class.json b/crates/cairo-lang-starknet/test_data/with_ownable_mini__ownable_mini_contract.contract_class.json index 0dc58c04679..2682c59b779 100644 --- a/crates/cairo-lang-starknet/test_data/with_ownable_mini__ownable_mini_contract.contract_class.json +++ b/crates/cairo-lang-starknet/test_data/with_ownable_mini__ownable_mini_contract.contract_class.json @@ -5,7 +5,7 @@ "0x0", "0x2", "0x7", - "0x0", + "0x1", "0x124", "0xdc", "0x38", diff --git a/crates/cairo-lang-syntax/Cargo.toml b/crates/cairo-lang-syntax/Cargo.toml index c62c83096b4..c53ae941ffa 100644 --- a/crates/cairo-lang-syntax/Cargo.toml +++ b/crates/cairo-lang-syntax/Cargo.toml @@ -7,9 +7,9 @@ license-file.workspace = true description = "Cairo syntax representation." [dependencies] -cairo-lang-debug = { path = "../cairo-lang-debug", version = "~2.7.0" } -cairo-lang-filesystem = { path = "../cairo-lang-filesystem", 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-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } num-bigint = { workspace = true, default-features = true } num-traits = { workspace = true, default-features = true } salsa.workspace = true diff --git a/crates/cairo-lang-test-plugin/Cargo.toml b/crates/cairo-lang-test-plugin/Cargo.toml index 2f5e9cdc7ad..be555d8a8ce 100644 --- a/crates/cairo-lang-test-plugin/Cargo.toml +++ b/crates/cairo-lang-test-plugin/Cargo.toml @@ -8,6 +8,7 @@ description = "Cairo test compilation plugin." [dependencies] anyhow.workspace = true +<<<<<<< HEAD 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" } @@ -20,6 +21,35 @@ 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-syntax = { path = "../cairo-lang-syntax", version = "~2.7.0" } cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.0" } +||||||| 223ca9963 +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-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-semantic = { path = "../cairo-lang-semantic", version = "~2.7.0" } +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-starknet = { path = "../cairo-lang-starknet", version = "~2.7.0" } +cairo-lang-starknet-classes = { path = "../cairo-lang-starknet-classes", 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-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-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-semantic = { path = "../cairo-lang-semantic", version = "~2.7.1" } +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-starknet = { path = "../cairo-lang-starknet", version = "~2.7.1" } +cairo-lang-starknet-classes = { path = "../cairo-lang-starknet-classes", 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" } +>>>>>>> origin/dev-v2.7.1 indoc.workspace = true itertools = { workspace = true, default-features = true } num-bigint = { workspace = true, default-features = true } diff --git a/crates/cairo-lang-test-runner/Cargo.toml b/crates/cairo-lang-test-runner/Cargo.toml index 2af805d6c4e..6ef78fd4c38 100644 --- a/crates/cairo-lang-test-runner/Cargo.toml +++ b/crates/cairo-lang-test-runner/Cargo.toml @@ -8,15 +8,15 @@ description = "Cairo tests runner. Used to run tests written in Cairo." [dependencies] anyhow.workspace = true -cairo-lang-compiler = { path = "../cairo-lang-compiler", version = "~2.7.0" } -cairo-lang-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.0" } -cairo-lang-runner = { path = "../cairo-lang-runner", version = "~2.7.0" } -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-sierra-generator = { path = "../cairo-lang-sierra-generator", version = "~2.7.0" } -cairo-lang-starknet = { path = "../cairo-lang-starknet", version = "~2.7.0" } -cairo-lang-test-plugin = { path = "../cairo-lang-test-plugin", 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-filesystem = { path = "../cairo-lang-filesystem", version = "~2.7.1" } +cairo-lang-runner = { path = "../cairo-lang-runner", version = "~2.7.1" } +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-sierra-generator = { path = "../cairo-lang-sierra-generator", version = "~2.7.1" } +cairo-lang-starknet = { path = "../cairo-lang-starknet", version = "~2.7.1" } +cairo-lang-test-plugin = { path = "../cairo-lang-test-plugin", version = "~2.7.1" } +cairo-lang-utils = { path = "../cairo-lang-utils", version = "~2.7.1" } colored.workspace = true itertools = { workspace = true, default-features = true } num-traits = { workspace = true, default-features = true } diff --git a/crates/cairo-lang-test-utils/Cargo.toml b/crates/cairo-lang-test-utils/Cargo.toml index 2073cd76a39..668a106586f 100644 --- a/crates/cairo-lang-test-utils/Cargo.toml +++ b/crates/cairo-lang-test-utils/Cargo.toml @@ -12,8 +12,8 @@ description = "Utilities for writing tests in the Cairo compiler project." testing = ["dep:cairo-lang-utils", "dep:colored", "dep:log", "dep:pretty_assertions", "dep:cairo-lang-formatter"] [dependencies] -cairo-lang-utils = { path = "../cairo-lang-utils", optional = true, version = "~2.7.0" } -cairo-lang-formatter = { path = "../cairo-lang-formatter", optional = true, version = "~2.7.0" } +cairo-lang-utils = { path = "../cairo-lang-utils", optional = true, version = "~2.7.1" } +cairo-lang-formatter = { path = "../cairo-lang-formatter", optional = true, version = "~2.7.1" } colored = { workspace = true, optional = true } log = { workspace = true, optional = true } pretty_assertions = { workspace = true, optional = true } diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh index fa37cf25428..d5de0458781 100755 --- a/scripts/bump_version.sh +++ b/scripts/bump_version.sh @@ -4,7 +4,7 @@ set -euo pipefail SCARB_REPO="https://github.com/software-mansion/scarb" -CURRENT_VERSION='2.7.0' +CURRENT_VERSION='2.7.1' NEW_VERSION="$@" # NOTE: These two functions were copied from asdf-scarb. diff --git a/vscode-cairo/package-lock.json b/vscode-cairo/package-lock.json index 2f1b19a5246..e9f458e45ae 100644 --- a/vscode-cairo/package-lock.json +++ b/vscode-cairo/package-lock.json @@ -1,12 +1,12 @@ { "name": "cairo1", - "version": "2.7.0", + "version": "2.7.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cairo1", - "version": "2.7.0", + "version": "2.7.1", "license": "Apache-2.0", "dependencies": { "vscode-languageclient": "^9.0.1" diff --git a/vscode-cairo/package.json b/vscode-cairo/package.json index 2f0308c2542..4ef112c1d98 100644 --- a/vscode-cairo/package.json +++ b/vscode-cairo/package.json @@ -2,7 +2,7 @@ "name": "cairo1", "displayName": "Cairo 1.0", "description": "Cairo language support for Visual Studio Code.", - "version": "2.7.0", + "version": "2.7.1", "publisher": "StarkWare", "categories": [ "Programming Languages",