diff --git a/Cargo.lock b/Cargo.lock index 2fab9535c..0a05d4a9a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -567,8 +567,9 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5abf875e93f696e783412d3f2a7c6f66e94e07c30b01559380b4d0707dc0050e" dependencies = [ "cairo-lang-utils", "indoc", @@ -580,8 +581,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f135e1768e199e88b04f824e34b9411ff49fc31970e77cbf5c6f448170441d18" dependencies = [ "anyhow", "cairo-lang-defs", @@ -603,16 +605,18 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e2bf0a6caf1e54938bc67ca082cbeb5385969784bfb1109c187ca9dc5e1806" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c65bb0e855afeb88d11585605f836bd0cd444375b234103e87342df2c91aba1b" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -627,8 +631,9 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab96083f60a077d300d0b89bd4b9c31731c95f5db355a11c4657ee25f3acc198" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -638,8 +643,9 @@ dependencies = [ [[package]] name = "cairo-lang-doc" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d3e20d492fea3ede67eb6f5fbf77a4128ea533bbfcaf84744c9f53c6906115" dependencies = [ "cairo-lang-defs", "cairo-lang-formatter", @@ -652,8 +658,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf2aaa50fa5b15070b2bf02c60a62f917f9aa1ff6dedf5a2627ecafe8e33cfa" dependencies = [ "cairo-lang-utils", "good_lp", @@ -661,8 +668,9 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8094bcf7e44204c2fc2f10760e7e2e5769a6267cba5d8a303c0331dd480d5663" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -674,8 +682,9 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a1d92f1163b3b0e22e6392d22f7a275b9e64ab453f32b8b62bb1aeedbe73e04" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -694,8 +703,9 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c464561703124297cd1983932ee72997b3e9517c387480fb69d6ed7e18c63115" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -712,8 +722,6 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-test-plugin", "cairo-lang-utils", - "indent", - "indoc", "itertools 0.12.1", "salsa", "scarb-metadata 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -729,8 +737,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25eb629a773c07c2863717d1711fd3ecc17807c1fc094bb90cccac56061056a4" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -777,8 +786,9 @@ version = "1.0.0" [[package]] name = "cairo-lang-parser" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff7b1d7af8e1bff971b8b9bbce796650a57de93dfb092bc0c17c2f85d915de6e" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -796,8 +806,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eccf06d643d155a72057dc93c40cf34dabe11e8c629dbf3111c528a3d750a66" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -814,8 +825,9 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffa10434f9ce0828e8d77f3a13ae2f878da453345b14d54a66de3e196c0e4674" dependencies = [ "cairo-lang-debug", "quote", @@ -824,8 +836,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4882d2263fb7c95dbab0c3b5578d8c0e2417fd680df8cc61aa50321b6a5a40d" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -837,8 +850,9 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01ab7b0e0640adaed21b9d9b9b94b3edf7f7ab95514b1dd40c679317a33dabea" dependencies = [ "ark-ff", "ark-secp256k1", @@ -867,8 +881,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba49614f98322e1ccda33265f8193f66cbd88eff23b0deb94db981aa0666650" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -893,8 +908,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81a41d56c6afebdbe2c5ffb4e216f60b07391c29c91fccf0a60790817f49ba68" dependencies = [ "anyhow", "cairo-lang-utils", @@ -920,8 +936,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "667050b93db661ebce0b33c92ce44abffebde37c5645e4761722ad3c49a1c34f" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -935,8 +952,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27fcbf81e8ed4efe7e9c30bbdfa8074b9af01a5e16154999dd9527baba27f1fb" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -950,8 +968,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058c05d10913a130fb21964f0bf1a37b05eafcf2f50a73cd4aa3e11da7e4cfc7" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -974,8 +993,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8607cc5cf16f3a930ad4b3799e986b0ca36ada2c0da1dd6bd2ef35cbb1eb9e74" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -994,8 +1014,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224624b1e279b3eea7693680f577335e66e6dd5fbfbd2576f4a7d0b5d697f61d" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -1003,8 +1024,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81a54ebea4ea990a33a2158ecdf46ffb3cb1af8fff6a79c3dd310c6a9ed43e82" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1033,8 +1055,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb66ae799e1963318e1bab782848f53797787c396dfd590be539f3f12d56ac4" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1056,8 +1079,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e673dc1058a8639c094a330a701e8902cbd34defe659a3d95bcf6c3f3de249d" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1071,8 +1095,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0dd466dbac4263573b81b83e22534285da30a4e7c15b888407fbb33d8accb9" dependencies = [ "genco", "xshell", @@ -1080,13 +1105,15 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e85792aa84336a5861f08f40849b52747f55abad53ba0378bfb868b2ea01821" dependencies = [ "anyhow", "cairo-lang-compiler", "cairo-lang-debug", "cairo-lang-defs", + "cairo-lang-diagnostics", "cairo-lang-filesystem", "cairo-lang-lowering", "cairo-lang-semantic", @@ -1106,8 +1133,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f537b362e80c63fec19a79d081dfd3be2051da4eda5f879e45c0f5eb241c6b" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1128,8 +1156,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09431da22acc1cf081b1802b73ff484bdc75ca1cd5ad6fa9b84fba8753b2e08f" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1140,8 +1169,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.6.4" -source = "git+https://github.com/starkware-libs/cairo?rev=c4f4f01f609ff837390544811598da4e6ece3504#c4f4f01f609ff837390544811598da4e6ece3504" +version = "2.7.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97498c08958be8d569c16982cac431d785adc3effdfa6d0775c65aec578dfd91" dependencies = [ "env_logger", "hashbrown 0.14.5", @@ -3424,7 +3454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -4573,7 +4603,7 @@ dependencies = [ [[package]] name = "scarb" -version = "2.6.4" +version = "2.7.0-rc.4" dependencies = [ "anyhow", "assert_fs", @@ -4663,7 +4693,7 @@ dependencies = [ [[package]] name = "scarb-build-metadata" -version = "2.6.4" +version = "2.7.0-rc.4" dependencies = [ "cargo_metadata", "semver", @@ -4671,7 +4701,7 @@ dependencies = [ [[package]] name = "scarb-cairo-language-server" -version = "2.6.4" +version = "2.7.0-rc.4" dependencies = [ "assert_fs", "cairo-lang-language-server", @@ -4683,7 +4713,7 @@ dependencies = [ [[package]] name = "scarb-cairo-run" -version = "2.6.4" +version = "2.7.0-rc.4" dependencies = [ "anyhow", "assert_fs", @@ -4705,7 +4735,7 @@ dependencies = [ [[package]] name = "scarb-cairo-test" -version = "2.6.4" +version = "2.7.0-rc.4" dependencies = [ "anyhow", "assert_fs", @@ -4725,7 +4755,7 @@ dependencies = [ [[package]] name = "scarb-doc" -version = "2.6.4" +version = "2.7.0-rc.4" dependencies = [ "anyhow", "assert_fs", @@ -4783,7 +4813,7 @@ dependencies = [ [[package]] name = "scarb-snforge-test-collector" -version = "2.6.4" +version = "2.7.0-rc.4" dependencies = [ "anyhow", "assert_fs", diff --git a/Cargo.toml b/Cargo.toml index 2d89c7ca2..b58ef36d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ members = [ "resolver" = "2" [workspace.package] -version = "2.6.4" +version = "2.7.0-rc.4" edition = "2021" authors = ["Software Mansion "] @@ -35,30 +35,30 @@ anyhow = "1" assert_fs = "1" async-trait = "0.1" axum = { version = "0.6", features = ["http2"] } -cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "c4f4f01f609ff837390544811598da4e6ece3504", features = ["env_logger"] } +cairo-lang-casm = "2.7.0-rc.3" +cairo-lang-compiler = "2.7.0-rc.3" +cairo-lang-debug = "2.7.0-rc.3" +cairo-lang-defs = "2.7.0-rc.3" +cairo-lang-diagnostics = "2.7.0-rc.3" +cairo-lang-doc = "2.7.0-rc.3" +cairo-lang-filesystem = "2.7.0-rc.3" +cairo-lang-formatter = "2.7.0-rc.3" +cairo-lang-language-server = "2.7.0-rc.3" +cairo-lang-lowering = "2.7.0-rc.3" +cairo-lang-parser = "2.7.0-rc.3" +cairo-lang-project = "2.7.0-rc.3" +cairo-lang-runner = "2.7.0-rc.3" +cairo-lang-semantic = "2.7.0-rc.3" +cairo-lang-sierra = "2.7.0-rc.3" +cairo-lang-sierra-generator = "2.7.0-rc.3" +cairo-lang-sierra-to-casm = "2.7.0-rc.3" +cairo-lang-sierra-type-size = "2.7.0-rc.3" +cairo-lang-starknet = "2.7.0-rc.3" +cairo-lang-starknet-classes = "2.7.0-rc.3" +cairo-lang-syntax = "2.7.0-rc.3" +cairo-lang-test-plugin = "2.7.0-rc.3" +cairo-lang-test-runner = "2.7.0-rc.3" +cairo-lang-utils = { version = "2.7.0-rc.3", features = ["env_logger"] } camino = { version = "1", features = ["serde1"] } cargo_metadata = ">=0.18" clap = { version = "4", features = ["derive", "env", "string"] } diff --git a/examples/dependencies/Scarb.toml b/examples/dependencies/Scarb.toml index ee6eadfda..ee029154a 100644 --- a/examples/dependencies/Scarb.toml +++ b/examples/dependencies/Scarb.toml @@ -8,4 +8,4 @@ version = "0.1.0" alexandria_math = { git = "https://github.com/keep-starknet-strange/alexandria.git" } [dev-dependencies] -cairo_test = "2.6.4" +cairo_test = "2.7.0-rc.3" diff --git a/examples/hello_world/Scarb.toml b/examples/hello_world/Scarb.toml index bc239bb86..a3672972c 100644 --- a/examples/hello_world/Scarb.toml +++ b/examples/hello_world/Scarb.toml @@ -8,4 +8,4 @@ edition = "2023_10" [dependencies] [dev-dependencies] -cairo_test = "2.6.4" +cairo_test = "2.7.0-rc.3" diff --git a/examples/starknet_hello_world/Scarb.toml b/examples/starknet_hello_world/Scarb.toml index c58ca29e3..fddf77d34 100644 --- a/examples/starknet_hello_world/Scarb.toml +++ b/examples/starknet_hello_world/Scarb.toml @@ -5,9 +5,9 @@ version = "0.1.0" # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] -starknet = "2.6.4" +starknet = "2.7.0-rc.3" [dev-dependencies] -cairo_test = "2.6.4" +cairo_test = "2.7.0-rc.3" [[target.starknet-contract]] diff --git a/examples/starknet_multiple_contracts/Scarb.toml b/examples/starknet_multiple_contracts/Scarb.toml index bd3bc6e98..97a0cde1d 100644 --- a/examples/starknet_multiple_contracts/Scarb.toml +++ b/examples/starknet_multiple_contracts/Scarb.toml @@ -5,9 +5,9 @@ version = "0.1.0" # See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html [dependencies] -starknet = "2.6.4" +starknet = "2.7.0-rc.3" [dev-dependencies] -cairo_test = "2.6.4" +cairo_test = "2.7.0-rc.3" [[target.starknet-contract]] diff --git a/examples/workspaces/Scarb.toml b/examples/workspaces/Scarb.toml index f4a2fc3fd..7a65a821a 100644 --- a/examples/workspaces/Scarb.toml +++ b/examples/workspaces/Scarb.toml @@ -10,8 +10,8 @@ test = "snforge" exit_first = true [workspace.dependencies] -cairo_test = "2.6.4" -starknet = "2.6.4" +cairo_test = "2.7.0-rc.3" +starknet = "2.7.0-rc.3" [workspace.package] version = "0.1.0" diff --git a/extensions/scarb-snforge-test-collector/src/compilation/test_collector.rs b/extensions/scarb-snforge-test-collector/src/compilation/test_collector.rs index 032743b33..a33bf699c 100644 --- a/extensions/scarb-snforge-test-collector/src/compilation/test_collector.rs +++ b/extensions/scarb-snforge-test-collector/src/compilation/test_collector.rs @@ -250,7 +250,7 @@ fn insert_lib_entrypoint_content_into_db( let module_id = ModuleId::CrateRoot(main_crate_id); let file_id = db.module_main_file(module_id).unwrap(); db.as_files_group_mut() - .override_file_content(file_id, Some(Arc::new(lib_content.to_string()))); + .override_file_content(file_id, Some(Arc::from(lib_content))); main_crate_id } diff --git a/scarb/src/compiler/compilers/test.rs b/scarb/src/compiler/compilers/test.rs index 423b4ba3c..5556077c7 100644 --- a/scarb/src/compiler/compilers/test.rs +++ b/scarb/src/compiler/compilers/test.rs @@ -46,8 +46,7 @@ impl Compiler for TestCompiler { .compiler_config .unstable_add_statements_functions_debug_info, }; - let allow_warnings = unit.compiler_config.allow_warnings; - compile_test_prepared_db(db, config, main_crate_ids, test_crate_ids, allow_warnings)? + compile_test_prepared_db(db, config, main_crate_ids, test_crate_ids)? }; { diff --git a/scarb/src/compiler/db.rs b/scarb/src/compiler/db.rs index 7b0721c7a..f16cbf25a 100644 --- a/scarb/src/compiler/db.rs +++ b/scarb/src/compiler/db.rs @@ -108,7 +108,7 @@ fn inject_virtual_wrapper_lib(db: &mut RootDatabase, unit: &CairoCompilationUnit let file_id = db.module_main_file(module_id).unwrap(); // Inject virtual lib file wrapper. db.as_files_group_mut() - .override_file_content(file_id, Some(Arc::new(content))); + .override_file_content(file_id, Some(Arc::from(content.as_str()))); } Ok(()) diff --git a/scarb/src/ops/new.rs b/scarb/src/ops/new.rs index 37ca0da9d..5aaa404ea 100644 --- a/scarb/src/ops/new.rs +++ b/scarb/src/ops/new.rs @@ -9,7 +9,7 @@ use crate::internal::fsx; use crate::internal::restricted_names; use crate::subcommands::get_env_vars; use crate::{ops, DEFAULT_SOURCE_PATH, DEFAULT_TARGET_DIR_NAME, MANIFEST_FILE_NAME}; -use scarb_build_metadata::SCARB_VERSION; +use scarb_build_metadata::CAIRO_VERSION; use std::process::{Command, Stdio}; #[derive(Clone, Copy, Debug, PartialEq)] @@ -148,7 +148,7 @@ fn mk( formatdoc! {r#" [dev-dependencies] - cairo_test = "{SCARB_VERSION}" + cairo_test = "{CAIRO_VERSION}" "#} }; fsx::write( diff --git a/scarb/tests/build_starknet_contract.rs b/scarb/tests/build_starknet_contract.rs index 62d1cc77d..e68693ee2 100644 --- a/scarb/tests/build_starknet_contract.rs +++ b/scarb/tests/build_starknet_contract.rs @@ -387,7 +387,7 @@ fn compile_starknet_contract_without_starknet_dep() { fn constructor(ref self: ContractState, value_: u128) { ^***********^ - error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapWriteAccessTrait::write and StoragePointerWriteAccess::write. Consider adding type annotations or explicitly refer to the impl function. + error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapWriteAccess::write and StoragePointerWriteAccess::write. Consider adding type annotations or explicitly refer to the impl function. --> [..]src/lib.cairo:20:20 self.value.write(value_); ^***^ @@ -402,7 +402,7 @@ fn compile_starknet_contract_without_starknet_dep() { fn get(self: @ContractState) -> u128 { ^***********^ - error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapReadAccessTrait::read and StoragePointerReadAccess::read. Consider adding type annotations or explicitly refer to the impl function. + error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapReadAccess::read and StoragePointerReadAccess::read. Consider adding type annotations or explicitly refer to the impl function. --> [..]src/lib.cairo:26:24 self.value.read() ^**^ @@ -412,7 +412,7 @@ fn compile_starknet_contract_without_starknet_dep() { fn increase(ref self: ContractState, a: u128) { ^***********^ - error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapWriteAccessTrait::write and StoragePointerWriteAccess::write. Consider adding type annotations or explicitly refer to the impl function. + error: Ambiguous method call. More than one applicable trait function with a suitable self type was found: StorageMapWriteAccess::write and StoragePointerWriteAccess::write. Consider adding type annotations or explicitly refer to the impl function. --> [..]src/lib.cairo:29:24 self.value.write( self.value.read() + a ); ^***^