From e3fb97c2881550368d069ac9b556f93eb54ab5a8 Mon Sep 17 00:00:00 2001 From: Ammar Arif Date: Tue, 26 Mar 2024 06:42:57 +0900 Subject: [PATCH] Remove `native` feature for now --- Cargo.lock | 363 +----------------------------- crates/katana/executor/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 362 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db777f919d..c8a1746b3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1010,29 +1010,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.66.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" -dependencies = [ - "bitflags 2.4.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease 0.2.16", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.49", - "which 4.4.2", -] - [[package]] name = "bindgen" version = "0.68.1" @@ -1044,16 +1021,13 @@ dependencies = [ "clang-sys", "lazy_static", "lazycell", - "log", "peeking_take_while", - "prettyplease 0.2.16", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", "syn 2.0.49", - "which 4.4.2", ] [[package]] @@ -2049,63 +2023,6 @@ dependencies = [ "time", ] -[[package]] -name = "cairo-native" -version = "0.1.0" -source = "git+https://github.com/lambdaclass/cairo_native?rev=baf57d2dde0036ac4848fc40c672826fb7ffcde4#baf57d2dde0036ac4848fc40c672826fb7ffcde4" -dependencies = [ - "anyhow", - "bumpalo", - "cairo-felt", - "cairo-lang-compiler", - "cairo-lang-defs", - "cairo-lang-diagnostics", - "cairo-lang-filesystem", - "cairo-lang-lowering", - "cairo-lang-runner", - "cairo-lang-semantic", - "cairo-lang-sierra", - "cairo-lang-sierra-ap-change", - "cairo-lang-sierra-gas", - "cairo-lang-sierra-generator", - "cairo-lang-starknet", - "cairo-lang-test-plugin", - "cairo-lang-utils", - "cairo-native-runtime", - "cc", - "clap", - "colored", - "educe", - "id-arena", - "itertools 0.12.1", - "lazy_static", - "libc", - "libloading", - "llvm-sys", - "melior", - "mlir-sys", - "num-bigint", - "num-traits 0.2.18", - "starknet-types-core", - "tempfile", - "thiserror", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "cairo-native-runtime" -version = "0.1.0" -source = "git+https://github.com/lambdaclass/cairo_native?rev=baf57d2dde0036ac4848fc40c672826fb7ffcde4#baf57d2dde0036ac4848fc40c672826fb7ffcde4" -dependencies = [ - "cairo-lang-runner", - "lazy_static", - "libc", - "starknet-crypto 0.6.1", - "starknet-curve 0.4.1", - "starknet-types-core", -] - [[package]] name = "cairo-vm" version = "0.9.2" @@ -2493,7 +2410,6 @@ dependencies = [ "anstyle", "clap_lex", "strsim 0.11.0", - "terminal_size", ] [[package]] @@ -2638,26 +2554,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "comrak" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6751998a48e2327773c95f6f8e03c6e77c0156ce539d74c17d2199ff3d05e197" -dependencies = [ - "clap", - "derive_builder 0.12.0", - "entities", - "memchr", - "once_cell", - "regex", - "shell-words", - "slug", - "syntect", - "typed-arena", - "unicode_categories", - "xdg", -] - [[package]] name = "concurrent-queue" version = "2.4.0" @@ -3263,12 +3159,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "deunicode" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" - [[package]] name = "diff" version = "0.1.13" @@ -3666,18 +3556,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "educe" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4bd92664bf78c4d3dba9b7cdafce6fa15b13ed3ed16175218196942e99168a8" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 2.0.49", -] - [[package]] name = "either" version = "1.10.0" @@ -3762,12 +3640,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "entities" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" - [[package]] name = "enum-as-inner" version = "0.6.0" @@ -3780,26 +3652,6 @@ dependencies = [ "syn 2.0.49", ] -[[package]] -name = "enum-ordinalize" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" -dependencies = [ - "enum-ordinalize-derive", -] - -[[package]] -name = "enum-ordinalize-derive" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.49", -] - [[package]] name = "enum_dispatch" version = "0.3.12" @@ -4237,16 +4089,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex", -] - [[package]] name = "fast_chemail" version = "0.9.6" @@ -7805,7 +7647,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "229004ebba9d1d5caf41623f1523b6d52abb47d9f6ab87f7e6fc992e3b854aef" dependencies = [ - "bindgen 0.68.1", + "bindgen", "errno", "libc", ] @@ -7832,15 +7674,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -7859,20 +7692,6 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" -[[package]] -name = "llvm-sys" -version = "170.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed90f72df5504c0af2e3a08ee7762a4a3e42ec2605811fc19f64879de40c50a" -dependencies = [ - "anyhow", - "cc", - "lazy_static", - "libc", - "regex-lite", - "semver 1.0.22", -] - [[package]] name = "lock_api" version = "0.4.11" @@ -7990,35 +7809,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "melior" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e76dd7ff903474595023aebb93f8287667a2fe95132c65e1c77efdb99c64a973" -dependencies = [ - "dashmap", - "melior-macro", - "mlir-sys", - "once_cell", -] - -[[package]] -name = "melior-macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "270cbbbd69a4d75a4c3f0266d6a046f4ab4c3457a352ed1879640c14d5c561e0" -dependencies = [ - "comrak", - "convert_case 0.6.0", - "once_cell", - "proc-macro2", - "quote", - "regex", - "syn 2.0.49", - "tblgen", - "unindent", -] - [[package]] name = "memchr" version = "2.7.1" @@ -8206,15 +7996,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mlir-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19a5391ed2759fd9060f538330b9b89191e7b13503d7499a4f9580af6699a" -dependencies = [ - "bindgen 0.68.1", -] - [[package]] name = "monch" version = "0.5.0" @@ -8782,28 +8563,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "onig" -version = "6.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" -dependencies = [ - "bitflags 1.3.2", - "libc", - "once_cell", - "onig_sys", -] - -[[package]] -name = "onig_sys" -version = "69.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" -dependencies = [ - "cc", - "pkg-config", -] - [[package]] name = "oorandom" version = "11.1.3" @@ -9346,20 +9105,6 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" -[[package]] -name = "plist" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" -dependencies = [ - "base64 0.21.7", - "indexmap 2.2.5", - "line-wrap", - "quick-xml", - "serde", - "time", -] - [[package]] name = "plotters" version = "0.3.5" @@ -9848,15 +9593,6 @@ dependencies = [ "unsigned-varint 0.8.0", ] -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", -] - [[package]] name = "quinn" version = "0.10.2" @@ -10093,12 +9829,6 @@ dependencies = [ "regex-syntax 0.8.2", ] -[[package]] -name = "regex-lite" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" - [[package]] name = "regex-syntax" version = "0.6.29" @@ -10201,7 +9931,7 @@ name = "reth-mdbx-sys" version = "0.1.0-alpha.13" source = "git+https://github.com/paradigmxyz/reth.git?rev=b34b0d3#b34b0d3c8de2598b2976f7ee2fc1a166c50b1b94" dependencies = [ - "bindgen 0.68.1", + "bindgen", "cc", "libc", ] @@ -10596,12 +10326,6 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - [[package]] name = "salsa" version = "0.16.1" @@ -11400,16 +11124,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "slug" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd94acec9c8da640005f8e135a39fc0372e74535e6b368b7a04b875f784c8c4" -dependencies = [ - "deunicode", - "wasm-bindgen", -] - [[package]] name = "smallvec" version = "1.13.1" @@ -12320,7 +12034,6 @@ dependencies = [ "cairo-lang-sierra", "cairo-lang-starknet", "cairo-lang-utils", - "cairo-native", "cairo-vm 1.0.0-rc1", "flate2", "getset", @@ -12538,29 +12251,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "syntect" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" -dependencies = [ - "bincode 1.3.3", - "bitflags 1.3.2", - "fancy-regex", - "flate2", - "fnv", - "once_cell", - "onig", - "plist", - "regex-syntax 0.8.2", - "serde", - "serde_derive", - "serde_json", - "thiserror", - "walkdir", - "yaml-rust", -] - [[package]] name = "system-configuration" version = "0.5.1" @@ -12599,18 +12289,6 @@ dependencies = [ "xattr", ] -[[package]] -name = "tblgen" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d19c09266feb8b16718d1183044d14703a0b4b59e55ce8beb4d6e21dd066b1b" -dependencies = [ - "bindgen 0.66.1", - "cc", - "paste", - "thiserror", -] - [[package]] name = "tempfile" version = "3.10.0" @@ -12643,16 +12321,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix 0.38.31", - "windows-sys 0.48.0", -] - [[package]] name = "termtree" version = "0.4.1" @@ -13637,12 +13305,6 @@ dependencies = [ "webrtc-util", ] -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - [[package]] name = "typed-builder" version = "0.18.1" @@ -13775,12 +13437,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" -[[package]] -name = "unindent" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" - [[package]] name = "universal-hash" version = "0.5.1" @@ -14756,12 +14412,6 @@ dependencies = [ "rustix 0.38.31", ] -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - [[package]] name = "xml-rs" version = "0.8.19" @@ -14798,15 +14448,6 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "yamux" version = "0.12.1" diff --git a/crates/katana/executor/Cargo.toml b/crates/katana/executor/Cargo.toml index 72b56e4f89..22830c4933 100644 --- a/crates/katana/executor/Cargo.toml +++ b/crates/katana/executor/Cargo.toml @@ -43,5 +43,5 @@ tokio.workspace = true default = [ "blockifier", "sir" ] blockifier = [ "dep:blockifier", "dep:cairo-vm" ] -native = [ "sir", "sir/cairo-native" ] +# native = [ "sir", "sir/cairo-native" ] sir = [ "dep:sir", "dep:starknet-types-core" ]