diff --git a/Cargo.lock b/Cargo.lock index 3a8d0d0b9..7dc6127b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -563,7 +563,7 @@ dependencies = [ [[package]] name = "cairo-lang-casm" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-utils", "indoc", @@ -576,7 +576,7 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "anyhow", "cairo-lang-defs", @@ -598,7 +598,7 @@ dependencies = [ [[package]] name = "cairo-lang-debug" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-utils", ] @@ -606,7 +606,7 @@ dependencies = [ [[package]] name = "cairo-lang-defs" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -622,7 +622,7 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -633,7 +633,7 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-utils", "good_lp", @@ -642,7 +642,7 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -655,7 +655,7 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -675,7 +675,7 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -703,7 +703,7 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -727,7 +727,7 @@ dependencies = [ [[package]] name = "cairo-lang-parser" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -746,7 +746,7 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -764,7 +764,7 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-debug", "quote", @@ -774,7 +774,7 @@ dependencies = [ [[package]] name = "cairo-lang-project" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -787,7 +787,7 @@ dependencies = [ [[package]] name = "cairo-lang-runner" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "ark-ff", "ark-secp256k1", @@ -795,6 +795,7 @@ dependencies = [ "ark-std", "cairo-felt", "cairo-lang-casm", + "cairo-lang-lowering", "cairo-lang-sierra", "cairo-lang-sierra-ap-change", "cairo-lang-sierra-generator", @@ -816,7 +817,7 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -840,7 +841,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "anyhow", "cairo-felt", @@ -865,7 +866,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -879,7 +880,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -893,7 +894,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -915,7 +916,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "assert_matches", "cairo-felt", @@ -935,7 +936,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -944,7 +945,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "anyhow", "cairo-felt", @@ -974,7 +975,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-felt", "cairo-lang-casm", @@ -998,7 +999,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1013,7 +1014,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "genco", "xshell", @@ -1022,7 +1023,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "anyhow", "cairo-felt", @@ -1049,7 +1050,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "anyhow", "cairo-felt", @@ -1071,7 +1072,7 @@ dependencies = [ [[package]] name = "cairo-lang-utils" version = "2.5.3" -source = "git+https://github.com/starkware-libs/cairo?rev=7bf91178ad4a775943da53f1dab94068e5d70e31#7bf91178ad4a775943da53f1dab94068e5d70e31" +source = "git+https://github.com/starkware-libs/cairo?rev=c20ac70ca515de15692f2f514325abb84cc79152#c20ac70ca515de15692f2f514325abb84cc79152" dependencies = [ "env_logger", "hashbrown 0.14.3", diff --git a/Cargo.toml b/Cargo.toml index fe4b6bb77..b06b5c806 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,27 +33,27 @@ assert_fs = "1" async-trait = "0.1" axum = { version = "0.6", features = ["http2"] } cairo-felt = "0.9.1" -cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "7bf91178ad4a775943da53f1dab94068e5d70e31", version = "2.5.3", features = ["env_logger"] } +cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152" } +cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "c20ac70ca515de15692f2f514325abb84cc79152", version = "2.5.3", features = ["env_logger"] } camino = { version = "1", features = ["serde1"] } cargo_metadata = ">=0.18" clap = { version = "4", features = ["derive", "env", "string"] } diff --git a/extensions/scarb-cairo-language-server/src/main.rs b/extensions/scarb-cairo-language-server/src/main.rs index 8adebad05..b1b90bc90 100644 --- a/extensions/scarb-cairo-language-server/src/main.rs +++ b/extensions/scarb-cairo-language-server/src/main.rs @@ -1,8 +1,3 @@ -use cairo_lang_language_server::serve_language_service; -use cairo_lang_utils::logging::init_logging; - -#[tokio::main] -async fn main() { - init_logging(log::LevelFilter::Warn); - serve_language_service().await; +fn main() { + cairo_lang_language_server::start() }