Skip to content

Commit

Permalink
Update Cairo (#1363)
Browse files Browse the repository at this point in the history 
Derives list is now explicit:
starkware-libs/cairo#5804 (review)
  • Loading branch information
@maciektr
maciektr committed Jun 18, 2024
1 parent b86a512 commit 6ed9553
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 86 deletions.
61 changes: 31 additions & 30 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 24 additions & 23 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,33 +35,34 @@ 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 = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85" }
cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "04ad5913320d903734cd20507ba79feb94f38f85", features = ["env_logger"] }
cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63" }
cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "8cecda122ceec83be6d758c9cd8f2cf3f70bfe63", features = ["env_logger"] }
camino = { version = "1", features = ["serde1"] }
cargo_metadata = ">=0.18"
clap = { version = "4", features = ["derive", "env", "string"] }
console = "0.15"
convert_case = "0.6.0"
darling = "0.20"
data-encoding = "2"
deno_task_shell = ">=0.13"
Expand Down
1 change: 1 addition & 0 deletions scarb/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ cairo-lang-test-plugin.workspace = true
cairo-lang-utils.workspace = true
camino.workspace = true
clap.workspace = true
convert_case.workspace = true
create-output-dir = { path = "../utils/create-output-dir" }
data-encoding.workspace = true
deno_task_shell.workspace = true
Expand Down
9 changes: 9 additions & 0 deletions scarb/src/compiler/plugin/proc_macro/ffi.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,15 @@ impl ProcMacroInstance {
.collect()
}

pub fn declared_derives(&self) -> Vec<String> {
self.get_expansions()
.iter()
.filter(|e| e.kind == ExpansionKind::Derive)
.map(|e| e.name.clone())
.map(Into::into)
.collect()
}

pub fn executable_attributes(&self) -> Vec<String> {
self.get_expansions()
.iter()
Expand Down
Loading

0 comments on commit 6ed9553

Please sign in to comment.