Update cairo (#2057)

Author: maciektr

Cargo.lock

@@ -40,29 +40,29 @@ assert_fs = "1"
 async-trait = "0.1"
 axum = { version = "0.6", features = ["http2"] }
 bincode = "2.0.0"
-cairo-lang-compiler = "2.11.2"
-cairo-lang-defs = "2.11.2"
-cairo-lang-diagnostics = "2.11.2"
-cairo-lang-doc = "2.11.2"
-cairo-lang-executable = "2.11.2"
-cairo-lang-filesystem = "2.11.2"
-cairo-lang-formatter = "2.11.2"
-cairo-lang-lowering = "2.11.2"
-cairo-lang-parser = "2.11.2"
-cairo-lang-runner = "2.11.2"
-cairo-lang-semantic = "2.11.2"
-cairo-lang-sierra = "2.11.2"
-cairo-lang-sierra-generator = "2.11.2"
-cairo-lang-sierra-to-casm = "2.11.2"
-cairo-lang-starknet = "2.11.2"
-cairo-lang-starknet-classes = "2.11.2"
-cairo-lang-syntax = "2.11.2"
-cairo-lang-test-plugin = "2.11.2"
-cairo-lang-test-runner = "2.11.2"
-cairo-lang-utils = { version = "2.11.2", features = ["env_logger"] }
-cairo-language-server = "2.11.2"
-cairo-lint-core = "2.11.2"
-cairo-vm = "1.0.1"
+cairo-lang-compiler = "*"
+cairo-lang-defs = "*"
+cairo-lang-diagnostics = "*"
+cairo-lang-doc = "*"
+cairo-lang-executable = "*"
+cairo-lang-filesystem = "*"
+cairo-lang-formatter = "*"
+cairo-lang-lowering = "*"
+cairo-lang-parser = "*"
+cairo-lang-runner = "*"
+cairo-lang-semantic = "*"
+cairo-lang-sierra = "*"
+cairo-lang-sierra-generator = "*"
+cairo-lang-sierra-to-casm = "*"
+cairo-lang-starknet = "*"
+cairo-lang-starknet-classes = "*"
+cairo-lang-syntax = "*"
+cairo-lang-test-plugin = "*"
+cairo-lang-test-runner = "*"
+cairo-lang-utils = { version = "*", features = ["env_logger"] }
+cairo-language-server = "*"
+cairo-lint-core = "*"
+cairo-vm = "2.0.0"
 camino = { version = "1", features = ["serde1"] }
 cargo_metadata = ">=0.18"
 clap = { version = "4", features = ["derive", "env", "string"] }
@@ -117,11 +117,11 @@ serde_test = "1"
 sha2 = "0.10"
 similar-asserts = { version = "1", features = ["serde"] }
 smallvec = "1"
-smol_str = { version = "0.2", features = ["serde"] }
+smol_str = { version = "0.3", features = ["serde"] }
 snapbox = { version = "0.4", features = ["cmd", "path"] }
 starknet-types-core = "0.1"
-stwo-cairo-adapter = {  git = "https://github.com/starkware-libs/stwo-cairo", rev = "08ddec7125cd77104b3e0e3a84298a9d988778dd", features = ["std"] }
-stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "08ddec7125cd77104b3e0e3a84298a9d988778dd" }
+stwo-cairo-adapter = { version = "*", features = ["std"] }
+stwo_cairo_prover = "*"
 syn = "2"
 tar = "0.4"
 target-triple = "0.1"
@@ -148,6 +148,42 @@ zip = { version = "0.6", default-features = false, features = ["deflate"] }
 zstd = "0.13"
 
 [patch.crates-io]
+cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-eq-solver = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-executable = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-plugins = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-proc-macros = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-runnable-utils = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-sierra-ap-change = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-sierra-gas = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-syntax-codegen = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-test-utils = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "76e8c943895c904da121fb0f6e48551d367e64d8" }
+cairo-language-server = { git = "https://github.com/software-mansion/cairols", rev = "7b26a0edc124028781a92e68de24882faea0d885" }
+cairo-lint-core = { git = "https://github.com/software-mansion/cairo-lint", rev = "136ae392703c6ee6a8ad41b7b5e1329b8b9a7604" }
+stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "08ddec7125cd77104b3e0e3a84298a9d988778dd" }
+stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "08ddec7125cd77104b3e0e3a84298a9d988778dd" }
 
 [profile.release]
 lto = true

Cargo.toml

@@ -474,7 +474,7 @@ impl ItemData {
             id: documentable_item_id,
             name: id.name(db).into(),
             doc: db.get_item_documentation_as_tokens(documentable_item_id),
-            signature: Some(db.get_item_signature(documentable_item_id)),
+            signature: db.get_item_signature(documentable_item_id),
             full_path: id.full_path(db),
             parent_full_path: Some(id.parent_module(db).full_path(db)),
         }

extensions/scarb-doc/src/types.rs

@@ -2,5 +2,5 @@
 
 Fully qualified path: `hello_world::CircleDrop`
 
-<pre><code class="language-rust">impl CircleDrop&lt;&gt; of core::traits::Drop&lt;Circle&gt;;</code></pre>
+<pre><code class="language-rust">impl CircleDrop of Drop&lt;Circle&gt;;</code></pre>
 

extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-CircleDrop.md

@@ -2,14 +2,14 @@
 
 Fully qualified path: `hello_world::CirclePartialEq`
 
-<pre><code class="language-rust">impl CirclePartialEq&lt;&gt; of core::traits::PartialEq&lt;Circle&gt;</code></pre>
+<pre><code class="language-rust">impl CirclePartialEq of PartialEq&lt;Circle&gt;;</code></pre>
 
 ## Impl functions
 
 ### eq
 
 Fully qualified path: `hello_world::CirclePartialEq::eq`
 
-<pre><code class="language-rust">fn eq(lhs: @Circle, rhs: @Circle) -&gt; bool</code></pre>
+<pre><code class="language-rust">fn eq(lhs: Circle, rhs: Circle) -&gt; bool</code></pre>
 
 

extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-CirclePartialEq.md

@@ -2,21 +2,21 @@
 
 Fully qualified path: `hello_world::CircleSerde`
 
-<pre><code class="language-rust">impl CircleSerde&lt;&gt; of core::serde::Serde&lt;Circle&gt;</code></pre>
+<pre><code class="language-rust">impl CircleSerde of Serde&lt;Circle&gt;;</code></pre>
 
 ## Impl functions
 
 ### serialize
 
 Fully qualified path: `hello_world::CircleSerde::serialize`
 
-<pre><code class="language-rust">fn serialize(self: @Circle, ref output: core::array::Array&lt;felt252&gt;)</code></pre>
+<pre><code class="language-rust">fn serialize(self: Circle, ref output: Array&lt;felt252&gt;)</code></pre>
 
 
 ### deserialize
 
 Fully qualified path: `hello_world::CircleSerde::deserialize`
 
-<pre><code class="language-rust">fn deserialize(ref serialized: core::array::Span&lt;felt252&gt;) -&gt; core::option::Option&lt;Circle&gt;</code></pre>
+<pre><code class="language-rust">fn deserialize(ref serialized: Span&lt;felt252&gt;) -&gt; Option&lt;Circle&gt;</code></pre>
 
 

extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-CircleSerde.md

@@ -4,7 +4,7 @@ Implementation of the Shape trait for Circle
 
 Fully qualified path: `hello_world::CircleShape`
 
-<pre><code class="language-rust">impl CircleShape of Shape&lt;Circle&gt;</code></pre>
+<pre><code class="language-rust">impl CircleShape of Shape&lt;Circle&gt;;</code></pre>
 
 ## Impl constants
 

extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-CircleShape.md

@@ -5,9 +5,9 @@ Color enum with Red, Green, and Blue variants
 Fully qualified path: `hello_world::Color`
 
 <pre><code class="language-rust">enum Color {
-    Red: (),
-    Green: (),
-    Blue: (),
+    Red,
+    Green,
+    Blue,
 }</code></pre>
 
 ## Variants
@@ -18,7 +18,7 @@ Red color
 
 Fully qualified path: `hello_world::Color::Red`
 
-<pre><code class="language-rust">Red : ( )</code></pre>
+<pre><code class="language-rust">Red</code></pre>
 
 
 ### Green
@@ -27,7 +27,7 @@ Green color
 
 Fully qualified path: `hello_world::Color::Green`
 
-<pre><code class="language-rust">Green : ( )</code></pre>
+<pre><code class="language-rust">Green</code></pre>
 
 
 ### Blue
@@ -36,6 +36,6 @@ Blue color
 
 Fully qualified path: `hello_world::Color::Blue`
 
-<pre><code class="language-rust">Blue : ( )</code></pre>
+<pre><code class="language-rust">Blue</code></pre>
 
 

extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Color.md

@@ -25,7 +25,7 @@ Calculate the area of the shape
 
 Fully qualified path: `hello_world::Shape::area`
 
-<pre><code class="language-rust">fn area(self: T) -&gt; u32</code></pre>
+<pre><code class="language-rust">fn area&lt;T, T&gt;(self: T) -&gt; u32</code></pre>
 
 
 ## Trait types

extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Shape.md

@@ -2,5 +2,5 @@
 
 Fully qualified path: `hello_world::CircleDrop`
 
-<pre><code class="language-rust">impl CircleDrop&lt;&gt; of core::traits::Drop&lt;Circle&gt;;</code></pre>
+<pre><code class="language-rust">impl CircleDrop of Drop&lt;Circle&gt;;</code></pre>
 

extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-CircleDrop.md

@@ -2,14 +2,14 @@
 
 Fully qualified path: `hello_world::CirclePartialEq`
 
-<pre><code class="language-rust">impl CirclePartialEq&lt;&gt; of core::traits::PartialEq&lt;Circle&gt;</code></pre>
+<pre><code class="language-rust">impl CirclePartialEq of PartialEq&lt;Circle&gt;;</code></pre>
 
 ## Impl functions
 
 ### eq
 
 Fully qualified path: `hello_world::CirclePartialEq::eq`
 
-<pre><code class="language-rust">fn eq(lhs: @Circle, rhs: @Circle) -&gt; bool</code></pre>
+<pre><code class="language-rust">fn eq(lhs: Circle, rhs: Circle) -&gt; bool</code></pre>
 
 

extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-CirclePartialEq.md

@@ -2,21 +2,21 @@
 
 Fully qualified path: `hello_world::CircleSerde`
 
-<pre><code class="language-rust">impl CircleSerde&lt;&gt; of core::serde::Serde&lt;Circle&gt;</code></pre>
+<pre><code class="language-rust">impl CircleSerde of Serde&lt;Circle&gt;;</code></pre>
 
 ## Impl functions
 
 ### serialize
 
 Fully qualified path: `hello_world::CircleSerde::serialize`
 
-<pre><code class="language-rust">fn serialize(self: @Circle, ref output: core::array::Array&lt;felt252&gt;)</code></pre>
+<pre><code class="language-rust">fn serialize(self: Circle, ref output: Array&lt;felt252&gt;)</code></pre>
 
 
 ### deserialize
 
 Fully qualified path: `hello_world::CircleSerde::deserialize`
 
-<pre><code class="language-rust">fn deserialize(ref serialized: core::array::Span&lt;felt252&gt;) -&gt; core::option::Option&lt;Circle&gt;</code></pre>
+<pre><code class="language-rust">fn deserialize(ref serialized: Span&lt;felt252&gt;) -&gt; Option&lt;Circle&gt;</code></pre>
 
 

extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-CircleSerde.md

@@ -4,7 +4,7 @@ Implementation of the Shape trait for Circle
 
 Fully qualified path: `hello_world::CircleShape`
 
-<pre><code class="language-rust">impl CircleShape of Shape&lt;Circle&gt;</code></pre>
+<pre><code class="language-rust">impl CircleShape of Shape&lt;Circle&gt;;</code></pre>
 
 ## Impl constants
 

extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-CircleShape.md

@@ -5,9 +5,9 @@ Color enum with Red, Green, and Blue variants
 Fully qualified path: `hello_world::Color`
 
 <pre><code class="language-rust">enum Color {
-    Red: (),
-    Green: (),
-    Blue: (),
+    Red,
+    Green,
+    Blue,
 }</code></pre>
 
 ## Variants
@@ -18,7 +18,7 @@ Red color
 
 Fully qualified path: `hello_world::Color::Red`
 
-<pre><code class="language-rust">Red : ( )</code></pre>
+<pre><code class="language-rust">Red</code></pre>
 
 
 ### Green
@@ -27,7 +27,7 @@ Green color
 
 Fully qualified path: `hello_world::Color::Green`
 
-<pre><code class="language-rust">Green : ( )</code></pre>
+<pre><code class="language-rust">Green</code></pre>
 
 
 ### Blue
@@ -36,6 +36,6 @@ Blue color
 
 Fully qualified path: `hello_world::Color::Blue`
 
-<pre><code class="language-rust">Blue : ( )</code></pre>
+<pre><code class="language-rust">Blue</code></pre>
 
 

extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Color.md

@@ -25,7 +25,7 @@ Calculate the area of the shape
 
 Fully qualified path: `hello_world::Shape::area`
 
-<pre><code class="language-rust">fn area(self: T) -&gt; u32</code></pre>
+<pre><code class="language-rust">fn area&lt;T, T&gt;(self: T) -&gt; u32</code></pre>
 
 
 ## Trait types

extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Shape.md

@@ -59,7 +59,7 @@
               "item_data": {
                 "name": "VisibleImpl",
                 "doc": null,
-                "signature": "impl VisibleImpl of VisibleTrait<VisibleStruct>",
+                "signature": "impl VisibleImpl of VisibleTrait<VisibleStruct>;",
                 "full_path": "hello_world::VisibleImpl"
               }
             },
@@ -70,7 +70,7 @@
               "item_data": {
                 "name": "SecondVisibleImpl",
                 "doc": null,
-                "signature": "impl SecondVisibleImpl of SecondVisibleTrait<HiddenStruct, VisibleStruct>",
+                "signature": "impl SecondVisibleImpl of SecondVisibleTrait<<missing>, VisibleStruct>;",
                 "full_path": "hello_world::SecondVisibleImpl"
               }
             }

extensions/scarb-doc/tests/data/json_doc_hidden_impls.json

@@ -110,7 +110,7 @@
                       "item_data": {
                         "name": "test",
                         "doc": null,
-                        "signature": "fn test() -> ()",
+                        "signature": "fn test()",
                         "full_path": "sub_package::TestTrait::test"
                       }
                     }
@@ -140,7 +140,7 @@
                   "item_data": {
                     "name": "TestImpl",
                     "doc": null,
-                    "signature": "pub impl TestImpl of TestTrait",
+                    "signature": "pub impl TestImpl of TestTrait;",
                     "full_path": "sub_package::TestImpl"
                   }
                 }
@@ -150,7 +150,7 @@
                   "item_data": {
                     "name": "ExternalType",
                     "doc": null,
-                    "signature": "pub extern type ExternalType",
+                    "signature": "pub extern type ExternalType;",
                     "full_path": "sub_package::ExternalType"
                   }
                 }

extensions/scarb-doc/tests/data/json_reexports.json

@@ -65,7 +65,9 @@ impl MarkdownTargetChecker {
             if expected_dir_entry.file_type().is_file() {
                 assert!(actual_dir_entry.file_type().is_file());
 
-                let content = fs::read_to_string(actual_dir_entry.path()).unwrap();
+                let content = fs::read_to_string(actual_dir_entry.path())
+                    .unwrap()
+                    .replace("\r", "");
 
                 let expect_file =
                     expect_file![fsx::canonicalize(expected_dir_entry.path()).unwrap()];

extensions/scarb-doc/tests/markdown_target.rs

@@ -171,7 +171,7 @@ pub fn execute(
             "Saving output to:",
             &display_path(&scarb_target_dir, &output_file_path),
         ));
-        output_value.write_zip_file(output_file_path.as_std_path())?;
+        output_value.write_zip_file(output_file_path.as_std_path(), true)?;
     } else {
         ui.print(Status::new(
             "Saving output to:",