From 42440f2fee3904bdb620daad375901bccb121eba Mon Sep 17 00:00:00 2001 From: maciektr Date: Wed, 30 Oct 2024 14:25:51 +0100 Subject: [PATCH] Update Cairo (#1711) --- Cargo.lock | 78 +++++++++++++++++----------------- Cargo.toml | 48 ++++++++++----------- extensions/scarb-doc/src/db.rs | 6 +-- 3 files changed, 66 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 294a214b5..ee1d9f681 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -563,7 +563,7 @@ dependencies = [ [[package]] name = "cairo-lang-casm" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-utils", "indoc", @@ -576,7 +576,7 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "anyhow", "cairo-lang-defs", @@ -601,7 +601,7 @@ dependencies = [ [[package]] name = "cairo-lang-debug" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-utils", ] @@ -609,7 +609,7 @@ dependencies = [ [[package]] name = "cairo-lang-defs" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -625,7 +625,7 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "cairo-lang-doc" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-defs", "cairo-lang-filesystem", @@ -651,7 +651,7 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-utils", "good_lp", @@ -660,7 +660,7 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -694,7 +694,7 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -721,7 +721,7 @@ dependencies = [ "lsp-types", "rust-analyzer-salsa", "rustc-hash", - "scarb-metadata 1.12.0", + "scarb-metadata 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde", "serde_json", "smol_str", @@ -734,7 +734,7 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -799,7 +799,7 @@ checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf" [[package]] name = "cairo-lang-parser" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -818,7 +818,7 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -836,7 +836,7 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-debug", "quote", @@ -846,7 +846,7 @@ dependencies = [ [[package]] name = "cairo-lang-project" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -858,7 +858,7 @@ dependencies = [ [[package]] name = "cairo-lang-runner" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "ark-ff", "ark-secp256k1", @@ -889,7 +889,7 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -914,7 +914,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "anyhow", "cairo-lang-utils", @@ -940,7 +940,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -955,7 +955,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -970,7 +970,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -993,7 +993,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -1013,7 +1013,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -1022,7 +1022,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1051,7 +1051,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1073,7 +1073,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1088,7 +1088,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "genco", "xshell", @@ -1097,7 +1097,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1123,7 +1123,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1145,7 +1145,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "cairo-lang-utils" version = "2.8.4" -source = "git+https://github.com/starkware-libs/cairo?rev=1f0db2fbb40064b267d8a0fae3ed4ea612123d23#1f0db2fbb40064b267d8a0fae3ed4ea612123d23" +source = "git+https://github.com/starkware-libs/cairo?rev=cc5bd37096cc67d910509738908b6ac26b12f893#cc5bd37096cc67d910509738908b6ac26b12f893" dependencies = [ "env_logger", "hashbrown 0.14.5", @@ -4827,29 +4827,29 @@ dependencies = [ [[package]] name = "scarb-metadata" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170ebce1774a85568646ba4096827f898306665187eebd9282fee313e316518d" +version = "1.13.0" dependencies = [ + "assert_fs", + "cairo-lang-filesystem", "camino", + "derive_builder", "semver", "serde", "serde_json", + "snapbox", "thiserror", ] [[package]] name = "scarb-metadata" version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a8b71f63999dbb6d269fbc6fd61310016ab3a160fb13e52a6511a2b904359f0" dependencies = [ - "assert_fs", - "cairo-lang-filesystem", "camino", - "derive_builder", "semver", "serde", "serde_json", - "snapbox", "thiserror", ] diff --git a/Cargo.toml b/Cargo.toml index 5ece2c2e0..36dbbe0ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,30 +34,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 = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "1f0db2fbb40064b267d8a0fae3ed4ea612123d23", features = ["env_logger"] } +cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893" } +cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "cc5bd37096cc67d910509738908b6ac26b12f893", features = ["env_logger"] } camino = { version = "1", features = ["serde1"] } cargo_metadata = ">=0.18" clap = { version = "4", features = ["derive", "env", "string"] } diff --git a/extensions/scarb-doc/src/db.rs b/extensions/scarb-doc/src/db.rs index 28d5faf0e..468951bfb 100644 --- a/extensions/scarb-doc/src/db.rs +++ b/extensions/scarb-doc/src/db.rs @@ -1,5 +1,5 @@ use cairo_lang_compiler::project::{update_crate_roots_from_project_config, ProjectConfig}; -use cairo_lang_defs::db::{ext_as_virtual_impl, DefsDatabase, DefsGroup}; +use cairo_lang_defs::db::{try_ext_as_virtual_impl, DefsDatabase, DefsGroup}; use cairo_lang_doc::db::{DocDatabase, DocGroup}; use cairo_lang_filesystem::cfg::{Cfg, CfgSet}; use cairo_lang_filesystem::db::{ @@ -74,8 +74,8 @@ impl ScarbDocDatabase { impl salsa::Database for ScarbDocDatabase {} impl ExternalFiles for ScarbDocDatabase { - fn ext_as_virtual(&self, external_id: salsa::InternId) -> VirtualFile { - ext_as_virtual_impl(self.upcast(), external_id) + fn try_ext_as_virtual(&self, external_id: salsa::InternId) -> Option { + try_ext_as_virtual_impl(self.upcast(), external_id) } }