From a3576026dea1c999037155d305eaecd41c4efc14 Mon Sep 17 00:00:00 2001 From: drknzz Date: Mon, 13 May 2024 11:53:38 +0200 Subject: [PATCH] trait_item_names -> trait_required_item_names --- Cargo.lock | 60 ++++++++++++++++---------------- Cargo.toml | 46 ++++++++++++------------ extensions/scarb-doc/src/main.rs | 2 +- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fb90da042..becbfec5e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -543,7 +543,7 @@ dependencies = [ [[package]] name = "cairo-lang-casm" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-utils", "indoc", @@ -556,7 +556,7 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "anyhow", "cairo-lang-defs", @@ -579,7 +579,7 @@ dependencies = [ [[package]] name = "cairo-lang-debug" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-utils", ] @@ -587,7 +587,7 @@ dependencies = [ [[package]] name = "cairo-lang-defs" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -614,7 +614,7 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-utils", "good_lp", @@ -623,7 +623,7 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -636,7 +636,7 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -656,7 +656,7 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -686,7 +686,7 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -734,7 +734,7 @@ version = "1.0.0" [[package]] name = "cairo-lang-parser" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -753,7 +753,7 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -771,7 +771,7 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-debug", "quote", @@ -781,7 +781,7 @@ dependencies = [ [[package]] name = "cairo-lang-project" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -794,7 +794,7 @@ dependencies = [ [[package]] name = "cairo-lang-runner" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "ark-ff", "ark-secp256k1", @@ -825,7 +825,7 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -851,7 +851,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "anyhow", "cairo-felt", @@ -876,7 +876,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -891,7 +891,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -906,7 +906,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -930,7 +930,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "assert_matches", "cairo-felt", @@ -950,7 +950,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -959,7 +959,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "anyhow", "cairo-felt", @@ -989,7 +989,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-felt", "cairo-lang-casm", @@ -1013,7 +1013,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1028,7 +1028,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "genco", "xshell", @@ -1037,7 +1037,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "anyhow", "cairo-felt", @@ -1064,7 +1064,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "anyhow", "cairo-felt", @@ -1086,7 +1086,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "cairo-lang-utils" version = "2.6.3" -source = "git+https://github.com/starkware-libs/cairo?rev=b60791d93a367d570535757cb221b4d114a31183#b60791d93a367d570535757cb221b4d114a31183" +source = "git+https://github.com/starkware-libs/cairo?rev=290f51f554c978180ca9d91177423305959cbed5#290f51f554c978180ca9d91177423305959cbed5" dependencies = [ "env_logger", "hashbrown 0.14.5", diff --git a/Cargo.toml b/Cargo.toml index 1d50784e7..0e1bc2c90 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,28 +36,28 @@ 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 = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "b60791d93a367d570535757cb221b4d114a31183", features = ["env_logger"] } +cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5" } +cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "290f51f554c978180ca9d91177423305959cbed5", features = ["env_logger"] } camino = { version = "1", features = ["serde1"] } cargo_metadata = ">=0.18" clap = { version = "4", features = ["derive", "env", "string"] } @@ -119,8 +119,8 @@ toml = "0.8" toml_edit = { version = "0.22", features = ["serde"] } tower-http = { version = "0.4", features = ["fs"] } tracing = "0.1" -tracing-log = "0.2" tracing-core = "0.1" +tracing-log = "0.2" tracing-subscriber = { version = "0.3", features = ["env-filter"] } typed-builder = ">=0.17" url = { version = "2", features = ["serde"] } diff --git a/extensions/scarb-doc/src/main.rs b/extensions/scarb-doc/src/main.rs index f3816cf86..25d6aef57 100644 --- a/extensions/scarb-doc/src/main.rs +++ b/extensions/scarb-doc/src/main.rs @@ -36,7 +36,7 @@ fn main() -> Result<()> { item_documentation.insert(LookupItemId::ModuleItem(*item), item_doc); if let ModuleItemId::Trait(trait_id) = *item { - let trait_items_names = db.trait_item_names(trait_id).unwrap(); + let trait_items_names = db.trait_required_item_names(trait_id).unwrap(); for trait_item_name in trait_items_names.into_iter() { let trait_item_id = db