From 1faf9ce35ad7965b4302be8d26eb3ff5f795c7aa Mon Sep 17 00:00:00 2001 From: Mateusz Kowalski Date: Mon, 23 Sep 2024 17:12:34 +0200 Subject: [PATCH 1/5] Use compiler's paths directly / remove workaround code --- Cargo.lock | 8 +- extensions/scarb-doc/src/types.rs | 120 ++----- .../src/hello_world-Circle.md | 4 + .../src/hello_world-Shape.md | 2 +- .../src/hello_world.md | 3 + .../src/hello_world_sub_package.md | 3 + .../src/hello_world_sub_package.md | 3 + .../src/hello_world-Circle.md | 4 + .../src/hello_world-Shape.md | 2 +- .../src/hello_world.md | 3 + .../tests/data/json_output_test_data.json | 12 +- .../data/json_private_items_excluded.json | 42 +-- .../data/json_private_items_included.json | 312 +++++++++--------- 13 files changed, 240 insertions(+), 278 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 025b9de23..ce27f1c6f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1766,9 +1766,9 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -1776,9 +1776,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", diff --git a/extensions/scarb-doc/src/types.rs b/extensions/scarb-doc/src/types.rs index 02273e146..0311ac31b 100644 --- a/extensions/scarb-doc/src/types.rs +++ b/extensions/scarb-doc/src/types.rs @@ -80,11 +80,10 @@ impl Module { module_id: ModuleId, include_private_items: bool, ) -> Self { - // FIXME(#1438): compiler doesn't support fetching root crate doc let item_data = match module_id { ModuleId::CrateRoot(crate_id) => ItemData { name: crate_id.name(db).to_string(), - doc: None, + doc: db.get_item_documentation(DocumentableItemId::Crate(crate_id)), signature: None, full_path: module_id.full_path(db), }, @@ -323,9 +322,7 @@ impl Struct { include_private_items || is_visible_in_module(db, root_module_id, &semantic_member.id) }) - .map(|(_name, semantic_member)| { - Member::new(db, semantic_member.id, item_data.full_path.clone()) - }) + .map(|(_name, semantic_member)| Member::new(db, semantic_member.id)) .collect::>(); let node = id.stable_ptr(db); @@ -349,25 +346,13 @@ pub struct Member { } impl Member { - pub fn new(db: &ScarbDocDatabase, id: MemberId, struct_full_path: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: MemberId) -> Self { let node = id.stable_ptr(db); - let stable_location = StableLocation::new(node.0); - - let name = id.name(db).into(); - // TODO(#1438): Replace with `id.full_path(db)` after it is fixed in the compiler. - let full_path = format!("{}::{}", struct_full_path, name); - - let item_data = ItemData { - name, - doc: get_item_documentation(db, &stable_location), - signature: None, - full_path, - }; Self { id, node, - item_data, + item_data: ItemData::new(db, id, DocumentableItemId::Member(id)), } } } @@ -395,7 +380,7 @@ impl Enum { let variants = variants .iter() - .map(|(_name, variant_id)| Variant::new(db, *variant_id, item_data.full_path.clone())) + .map(|(_name, variant_id)| Variant::new(db, *variant_id)) .collect::>(); let node = id.stable_ptr(db); @@ -419,25 +404,13 @@ pub struct Variant { } impl Variant { - pub fn new(db: &ScarbDocDatabase, id: VariantId, enum_full_path: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: VariantId) -> Self { let node = id.stable_ptr(db); - let stable_location = StableLocation::new(node.0); - - let name = id.name(db).into(); - // TODO(#1438): Replace with `id.full_path(db)` after it is fixed in the compiler. - let full_path = format!("{}::{}", enum_full_path, name); - - let item_data = ItemData { - name, - doc: get_item_documentation(db, &stable_location), - signature: None, - full_path, - }; Self { id, node, - item_data, + item_data: ItemData::new(db, id, DocumentableItemId::Variant(id)), } } } @@ -513,26 +486,17 @@ impl Trait { id, LookupItemId::ModuleItem(ModuleItemId::Trait(id)).into(), ); - let full_path_to_trait = item_data - .full_path - .strip_suffix(item_data.name.as_str()) - .unwrap() - .to_string(); let trait_constants = db.trait_constants(id).unwrap(); let trait_constants = trait_constants .iter() - .map(|(_name, trait_constant_id)| { - TraitConstant::new(db, *trait_constant_id, full_path_to_trait.clone()) - }) + .map(|(_name, trait_constant_id)| TraitConstant::new(db, *trait_constant_id)) .collect::>(); let trait_types = db.trait_types(id).unwrap(); let trait_types = trait_types .iter() - .map(|(_name, trait_type_id)| { - TraitType::new(db, *trait_type_id, full_path_to_trait.clone()) - }) + .map(|(_name, trait_type_id)| TraitType::new(db, *trait_type_id)) .collect::>(); let trait_functions = db.trait_functions(id).unwrap(); @@ -564,21 +528,17 @@ pub struct TraitConstant { } impl TraitConstant { - pub fn new(db: &ScarbDocDatabase, id: TraitConstantId, full_path_to_trait: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: TraitConstantId) -> Self { let node = id.stable_ptr(db); - let mut item_data = ItemData::new( - db, - id, - LookupItemId::TraitItem(TraitItemId::Constant(id)).into(), - ); - // TODO(#1438): introduce proper fix in compiler - item_data.full_path = full_path_to_trait + &item_data.full_path; - Self { id, node, - item_data, + item_data: ItemData::new( + db, + id, + LookupItemId::TraitItem(TraitItemId::Constant(id)).into(), + ), } } } @@ -594,21 +554,17 @@ pub struct TraitType { } impl TraitType { - pub fn new(db: &ScarbDocDatabase, id: TraitTypeId, full_path_to_trait: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: TraitTypeId) -> Self { let node = id.stable_ptr(db); - let mut item_data = ItemData::new( - db, - id, - LookupItemId::TraitItem(TraitItemId::Type(id)).into(), - ); - // TODO(#1438): introduce proper fix in compiler - item_data.full_path = full_path_to_trait + &item_data.full_path; - Self { id, node, - item_data, + item_data: ItemData::new( + db, + id, + LookupItemId::TraitItem(TraitItemId::Type(id)).into(), + ), } } } @@ -660,22 +616,17 @@ impl Impl { id, LookupItemId::ModuleItem(ModuleItemId::Impl(id)).into(), ); - let full_path_to_impl = item_data - .full_path - .strip_suffix(item_data.name.as_str()) - .unwrap() - .to_string(); let impl_types = db.impl_types(id).unwrap(); let impl_types = impl_types .iter() - .map(|(id, _)| ImplType::new(db, *id, full_path_to_impl.clone())) + .map(|(id, _)| ImplType::new(db, *id)) .collect::>(); let impl_constants = db.impl_constants(id).unwrap(); let impl_constants = impl_constants .iter() - .map(|(id, _)| ImplConstant::new(db, *id, full_path_to_impl.clone())) + .map(|(id, _)| ImplConstant::new(db, *id)) .collect::>(); let impl_functions = db.impl_functions(id).unwrap(); @@ -707,18 +658,13 @@ pub struct ImplType { } impl ImplType { - pub fn new(db: &ScarbDocDatabase, id: ImplTypeDefId, full_path_to_impl: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: ImplTypeDefId) -> Self { let node = id.stable_ptr(db); - let mut item_data = - ItemData::new(db, id, LookupItemId::ImplItem(ImplItemId::Type(id)).into()); - // TODO(#1438): introduce proper fix in compiler - item_data.full_path = full_path_to_impl + &item_data.full_path; - Self { id, node, - item_data, + item_data: ItemData::new(db, id, LookupItemId::ImplItem(ImplItemId::Type(id)).into()), } } } @@ -734,21 +680,17 @@ pub struct ImplConstant { } impl ImplConstant { - pub fn new(db: &ScarbDocDatabase, id: ImplConstantDefId, full_path_to_impl: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: ImplConstantDefId) -> Self { let node = id.stable_ptr(db); - let mut item_data = ItemData::new( - db, - id, - LookupItemId::ImplItem(ImplItemId::Constant(id)).into(), - ); - // TODO(#1438): introduce proper fix in compiler - item_data.full_path = full_path_to_impl + &item_data.full_path; - Self { id, node, - item_data, + item_data: ItemData::new( + db, + id, + LookupItemId::ImplItem(ImplItemId::Constant(id)).into(), + ), } } } diff --git a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Circle.md b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Circle.md index 206c8c3a4..0217f7b92 100644 --- a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Circle.md +++ b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Circle.md @@ -12,4 +12,8 @@ Radius of the circle Fully qualified path: `hello_world::Circle::radius` +```rust + radius: u32 +``` + diff --git a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Shape.md b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Shape.md index c0b8a4fec..33e3b8a7d 100644 --- a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Shape.md +++ b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Shape.md @@ -27,7 +27,7 @@ const SHAPE_CONST: felt252; Calculate the area of the shape -Fully qualified path: `Shape::area` +Fully qualified path: `hello_world::Shape::area` ```rust fn area(self: T) -> u32 diff --git a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world.md b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world.md index b17728f49..e6cacb9bf 100644 --- a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world.md +++ b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world.md @@ -1,5 +1,8 @@ # hello_world +Fibonacci sequence calculator + + Fully qualified path: `hello_world` ## Modules diff --git a/extensions/scarb-doc/tests/data/hello_world_sub_package_no_features/src/hello_world_sub_package.md b/extensions/scarb-doc/tests/data/hello_world_sub_package_no_features/src/hello_world_sub_package.md index 298cacd69..4e934703c 100644 --- a/extensions/scarb-doc/tests/data/hello_world_sub_package_no_features/src/hello_world_sub_package.md +++ b/extensions/scarb-doc/tests/data/hello_world_sub_package_no_features/src/hello_world_sub_package.md @@ -1,5 +1,8 @@ # hello_world_sub_package +Sub-package code (without feature) + + Fully qualified path: `hello_world_sub_package` ## Free functions diff --git a/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package.md b/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package.md index 298cacd69..5c0cff0f7 100644 --- a/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package.md +++ b/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package.md @@ -1,5 +1,8 @@ # hello_world_sub_package +Sub-package code (with feature) + + Fully qualified path: `hello_world_sub_package` ## Free functions diff --git a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Circle.md b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Circle.md index 206c8c3a4..0217f7b92 100644 --- a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Circle.md +++ b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Circle.md @@ -12,4 +12,8 @@ Radius of the circle Fully qualified path: `hello_world::Circle::radius` +```rust + radius: u32 +``` + diff --git a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Shape.md b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Shape.md index c0b8a4fec..33e3b8a7d 100644 --- a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Shape.md +++ b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Shape.md @@ -27,7 +27,7 @@ const SHAPE_CONST: felt252; Calculate the area of the shape -Fully qualified path: `Shape::area` +Fully qualified path: `hello_world::Shape::area` ```rust fn area(self: T) -> u32 diff --git a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world.md b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world.md index 0dcbc9921..74862f90f 100644 --- a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world.md +++ b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world.md @@ -1,5 +1,8 @@ # hello_world +Fibonacci sequence calculator + + Fully qualified path: `hello_world` ## Modules diff --git a/extensions/scarb-doc/tests/data/json_output_test_data.json b/extensions/scarb-doc/tests/data/json_output_test_data.json index 5a5e87c34..a6d3a0b02 100644 --- a/extensions/scarb-doc/tests/data/json_output_test_data.json +++ b/extensions/scarb-doc/tests/data/json_output_test_data.json @@ -6,7 +6,7 @@ "root_module": { "item_data": { "name": "hello_world", - "doc": null, + "doc": "Fibonacci sequence calculator\n", "signature": null, "full_path": "hello_world" }, @@ -75,7 +75,7 @@ "item_data": { "name": "radius", "doc": "Radius of the circle", - "signature": null, + "signature": " radius: u32", "full_path": "hello_world::Circle::radius" } } @@ -95,7 +95,7 @@ "item_data": { "name": "Red", "doc": "Red color", - "signature": null, + "signature": "", "full_path": "hello_world::Color::Red" } }, @@ -103,7 +103,7 @@ "item_data": { "name": "Green", "doc": "Green color", - "signature": null, + "signature": "", "full_path": "hello_world::Color::Green" } }, @@ -111,7 +111,7 @@ "item_data": { "name": "Blue", "doc": "Blue color", - "signature": null, + "signature": "", "full_path": "hello_world::Color::Blue" } } @@ -163,7 +163,7 @@ "name": "area", "doc": "Calculate the area of the shape", "signature": "fn area(self: T) -> u32", - "full_path": "Shape::area" + "full_path": "hello_world::Shape::area" } } ], diff --git a/extensions/scarb-doc/tests/data/json_private_items_excluded.json b/extensions/scarb-doc/tests/data/json_private_items_excluded.json index 43c85fc0b..89efa8732 100644 --- a/extensions/scarb-doc/tests/data/json_private_items_excluded.json +++ b/extensions/scarb-doc/tests/data/json_private_items_excluded.json @@ -73,7 +73,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -91,7 +91,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -165,7 +165,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -183,7 +183,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -250,7 +250,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -268,7 +268,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -350,7 +350,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -368,7 +368,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -442,7 +442,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -460,7 +460,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -527,7 +527,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -545,7 +545,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -627,7 +627,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -645,7 +645,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -719,7 +719,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -737,7 +737,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -804,7 +804,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -822,7 +822,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -914,7 +914,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicEnum::PUBLIC_VARIANT" } } @@ -932,7 +932,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateEnum::PUBLIC_VARIANT" } } @@ -950,7 +950,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateEnum::PRIVATE_VARIANT" } } diff --git a/extensions/scarb-doc/tests/data/json_private_items_included.json b/extensions/scarb-doc/tests/data/json_private_items_included.json index 36b349022..71e862727 100644 --- a/extensions/scarb-doc/tests/data/json_private_items_included.json +++ b/extensions/scarb-doc/tests/data/json_private_items_included.json @@ -61,7 +61,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicChildStructure::public_field" } }, @@ -69,7 +69,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicChildStructure::public_crate_field" } }, @@ -77,7 +77,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicChildStructure::private_field" } } @@ -95,7 +95,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildStructure::public_field" } }, @@ -103,7 +103,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildStructure::public_crate_field" } }, @@ -111,7 +111,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildStructure::private_field" } } @@ -129,7 +129,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PrivateChildStructure::public_field" } }, @@ -137,7 +137,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PrivateChildStructure::public_crate_field" } }, @@ -145,7 +145,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PrivateChildStructure::private_field" } } @@ -165,7 +165,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -183,7 +183,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -201,7 +201,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -263,7 +263,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildStructure::public_field" } }, @@ -271,7 +271,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildStructure::public_crate_field" } }, @@ -279,7 +279,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildStructure::private_field" } } @@ -297,7 +297,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildStructure::public_field" } }, @@ -305,7 +305,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -313,7 +313,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildStructure::private_field" } } @@ -331,7 +331,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PrivateChildStructure::public_field" } }, @@ -339,7 +339,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PrivateChildStructure::public_crate_field" } }, @@ -347,7 +347,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PrivateChildStructure::private_field" } } @@ -367,7 +367,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -385,7 +385,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -403,7 +403,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -465,7 +465,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicChildStructure::public_field" } }, @@ -473,7 +473,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicChildStructure::public_crate_field" } }, @@ -481,7 +481,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicChildStructure::private_field" } } @@ -499,7 +499,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicCrateChildStructure::public_field" } }, @@ -507,7 +507,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -515,7 +515,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicCrateChildStructure::private_field" } } @@ -533,7 +533,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PrivateChildStructure::public_field" } }, @@ -541,7 +541,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PrivateChildStructure::public_crate_field" } }, @@ -549,7 +549,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PrivateChildStructure::private_field" } } @@ -569,7 +569,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PrivateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -587,7 +587,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PrivateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -605,7 +605,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PrivateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -660,7 +660,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicParentStructure::public_field" } }, @@ -668,7 +668,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicParentStructure::public_crate_field" } }, @@ -676,7 +676,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicParentStructure::private_field" } } @@ -694,7 +694,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateParentStructure::public_field" } }, @@ -702,7 +702,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateParentStructure::public_crate_field" } }, @@ -710,7 +710,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateParentStructure::private_field" } } @@ -728,7 +728,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PrivateParentStructure::public_field" } }, @@ -736,7 +736,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PrivateParentStructure::public_crate_field" } }, @@ -744,7 +744,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PrivateParentStructure::private_field" } } @@ -764,7 +764,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -782,7 +782,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -800,7 +800,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PrivateParentEnum::PRIVATE_VARIANT" } } @@ -870,7 +870,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildStructure::public_field" } }, @@ -878,7 +878,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildStructure::public_crate_field" } }, @@ -886,7 +886,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildStructure::private_field" } } @@ -904,7 +904,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildStructure::public_field" } }, @@ -912,7 +912,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildStructure::public_crate_field" } }, @@ -920,7 +920,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildStructure::private_field" } } @@ -938,7 +938,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PrivateChildStructure::public_field" } }, @@ -946,7 +946,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PrivateChildStructure::public_crate_field" } }, @@ -954,7 +954,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PrivateChildStructure::private_field" } } @@ -974,7 +974,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -992,7 +992,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -1010,7 +1010,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -1072,7 +1072,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildStructure::public_field" } }, @@ -1080,7 +1080,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildStructure::public_crate_field" } }, @@ -1088,7 +1088,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildStructure::private_field" } } @@ -1106,7 +1106,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildStructure::public_field" } }, @@ -1114,7 +1114,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -1122,7 +1122,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildStructure::private_field" } } @@ -1140,7 +1140,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PrivateChildStructure::public_field" } }, @@ -1148,7 +1148,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PrivateChildStructure::public_crate_field" } }, @@ -1156,7 +1156,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PrivateChildStructure::private_field" } } @@ -1176,7 +1176,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -1194,7 +1194,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -1212,7 +1212,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -1274,7 +1274,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicChildStructure::public_field" } }, @@ -1282,7 +1282,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicChildStructure::public_crate_field" } }, @@ -1290,7 +1290,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicChildStructure::private_field" } } @@ -1308,7 +1308,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicCrateChildStructure::public_field" } }, @@ -1316,7 +1316,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -1324,7 +1324,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicCrateChildStructure::private_field" } } @@ -1342,7 +1342,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PrivateChildStructure::public_field" } }, @@ -1350,7 +1350,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PrivateChildStructure::public_crate_field" } }, @@ -1358,7 +1358,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PrivateChildStructure::private_field" } } @@ -1378,7 +1378,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -1396,7 +1396,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -1414,7 +1414,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PrivateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -1469,7 +1469,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicParentStructure::public_field" } }, @@ -1477,7 +1477,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicParentStructure::public_crate_field" } }, @@ -1485,7 +1485,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicParentStructure::private_field" } } @@ -1503,7 +1503,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateParentStructure::public_field" } }, @@ -1511,7 +1511,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateParentStructure::public_crate_field" } }, @@ -1519,7 +1519,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateParentStructure::private_field" } } @@ -1537,7 +1537,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateParentStructure::public_field" } }, @@ -1545,7 +1545,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateParentStructure::public_crate_field" } }, @@ -1553,7 +1553,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateParentStructure::private_field" } } @@ -1573,7 +1573,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -1591,7 +1591,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -1609,7 +1609,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PrivateParentEnum::PRIVATE_VARIANT" } } @@ -1679,7 +1679,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicChildStructure::public_field" } }, @@ -1687,7 +1687,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicChildStructure::public_crate_field" } }, @@ -1695,7 +1695,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicChildStructure::private_field" } } @@ -1713,7 +1713,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildStructure::public_field" } }, @@ -1721,7 +1721,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildStructure::public_crate_field" } }, @@ -1729,7 +1729,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildStructure::private_field" } } @@ -1747,7 +1747,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PrivateChildStructure::public_field" } }, @@ -1755,7 +1755,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PrivateChildStructure::public_crate_field" } }, @@ -1763,7 +1763,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PrivateChildStructure::private_field" } } @@ -1783,7 +1783,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -1801,7 +1801,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -1819,7 +1819,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -1881,7 +1881,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildStructure::public_field" } }, @@ -1889,7 +1889,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildStructure::public_crate_field" } }, @@ -1897,7 +1897,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildStructure::private_field" } } @@ -1915,7 +1915,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildStructure::public_field" } }, @@ -1923,7 +1923,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -1931,7 +1931,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildStructure::private_field" } } @@ -1949,7 +1949,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PrivateChildStructure::public_field" } }, @@ -1957,7 +1957,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PrivateChildStructure::public_crate_field" } }, @@ -1965,7 +1965,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PrivateChildStructure::private_field" } } @@ -1985,7 +1985,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -2003,7 +2003,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -2021,7 +2021,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -2083,7 +2083,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicChildStructure::public_field" } }, @@ -2091,7 +2091,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicChildStructure::public_crate_field" } }, @@ -2099,7 +2099,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicChildStructure::private_field" } } @@ -2117,7 +2117,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicCrateChildStructure::public_field" } }, @@ -2125,7 +2125,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -2133,7 +2133,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicCrateChildStructure::private_field" } } @@ -2151,7 +2151,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PrivateChildStructure::public_field" } }, @@ -2159,7 +2159,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PrivateChildStructure::public_crate_field" } }, @@ -2167,7 +2167,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PrivateChildStructure::private_field" } } @@ -2187,7 +2187,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PrivateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -2205,7 +2205,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PrivateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -2223,7 +2223,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PrivateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -2278,7 +2278,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicParentStructure::public_field" } }, @@ -2286,7 +2286,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicParentStructure::public_crate_field" } }, @@ -2294,7 +2294,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicParentStructure::private_field" } } @@ -2312,7 +2312,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateParentStructure::public_field" } }, @@ -2320,7 +2320,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateParentStructure::public_crate_field" } }, @@ -2328,7 +2328,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateParentStructure::private_field" } } @@ -2346,7 +2346,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PrivateParentStructure::public_field" } }, @@ -2354,7 +2354,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PrivateParentStructure::public_crate_field" } }, @@ -2362,7 +2362,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PrivateParentStructure::private_field" } } @@ -2382,7 +2382,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -2400,7 +2400,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -2418,7 +2418,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PrivateParentEnum::PRIVATE_VARIANT" } } @@ -2481,7 +2481,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicStructure::public_field" } }, @@ -2489,7 +2489,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicStructure::public_crate_field" } }, @@ -2497,7 +2497,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicStructure::private_field" } } @@ -2515,7 +2515,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateStructure::public_field" } }, @@ -2523,7 +2523,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateStructure::public_crate_field" } }, @@ -2531,7 +2531,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateStructure::private_field" } } @@ -2549,7 +2549,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateStructure::public_field" } }, @@ -2557,7 +2557,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateStructure::public_crate_field" } }, @@ -2565,7 +2565,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateStructure::private_field" } } @@ -2585,7 +2585,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicEnum::PUBLIC_VARIANT" } } @@ -2603,7 +2603,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateEnum::PUBLIC_VARIANT" } } @@ -2621,7 +2621,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateEnum::PRIVATE_VARIANT" } } From ef1d2140e03e80ebee03218d8c9c89881f4d79a1 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalski Date: Mon, 23 Sep 2024 17:12:34 +0200 Subject: [PATCH 2/5] Use compilator's paths directly / remove workaround code --- Cargo.lock | 86 ----- Cargo.toml | 48 +-- extensions/scarb-doc/src/types.rs | 120 ++----- .../src/hello_world-Circle.md | 4 + .../src/hello_world-Shape.md | 2 +- .../src/hello_world.md | 3 + .../src/hello_world_sub_package.md | 3 + .../src/hello_world_sub_package.md | 3 + .../src/hello_world-Circle.md | 4 + .../src/hello_world-Shape.md | 2 +- .../src/hello_world.md | 3 + .../tests/data/json_output_test_data.json | 12 +- .../data/json_private_items_excluded.json | 42 +-- .../data/json_private_items_included.json | 312 +++++++++--------- 14 files changed, 260 insertions(+), 384 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca5ec9fd6..c7856c3c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -568,7 +568,6 @@ dependencies = [ [[package]] name = "cairo-lang-casm" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-utils", "indoc", @@ -581,7 +580,6 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "anyhow", "cairo-lang-defs", @@ -606,7 +604,6 @@ dependencies = [ [[package]] name = "cairo-lang-debug" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-utils", ] @@ -614,7 +611,6 @@ dependencies = [ [[package]] name = "cairo-lang-defs" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -630,7 +626,6 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -641,7 +636,6 @@ dependencies = [ [[package]] name = "cairo-lang-doc" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-defs", "cairo-lang-filesystem", @@ -656,7 +650,6 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-utils", "good_lp", @@ -665,7 +658,6 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -679,7 +671,6 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -699,7 +690,6 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -735,7 +725,6 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -799,7 +788,6 @@ checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf" [[package]] name = "cairo-lang-parser" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -818,7 +806,6 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -836,7 +823,6 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-debug", "quote", @@ -846,7 +832,6 @@ dependencies = [ [[package]] name = "cairo-lang-project" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -859,7 +844,6 @@ dependencies = [ [[package]] name = "cairo-lang-runner" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "ark-ff", "ark-secp256k1", @@ -889,7 +873,6 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -914,7 +897,6 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "anyhow", "cairo-lang-utils", @@ -940,7 +922,6 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -955,7 +936,6 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -970,7 +950,6 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -993,7 +972,6 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -1013,7 +991,6 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -1022,7 +999,6 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1051,7 +1027,6 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1073,7 +1048,6 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1088,7 +1062,6 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "genco", "xshell", @@ -1097,7 +1070,6 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1123,7 +1095,6 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1145,7 +1116,6 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1157,18 +1127,14 @@ dependencies = [ [[package]] name = "cairo-lang-utils" version = "2.8.2" -source = "git+https://github.com/starkware-libs/cairo?rev=9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd#9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" dependencies = [ - "env_logger", "hashbrown 0.14.5", "indexmap 2.2.6", "itertools 0.12.1", - "log", "num-bigint", "num-traits 0.2.19", "schemars", "serde", - "time", ] [[package]] @@ -1764,29 +1730,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -3042,12 +2985,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c3b1f728c459d27b12448862017b96ad4767b1ec2ec5e6434e99f1577f085b8" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.30" @@ -3791,15 +3728,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - [[package]] name = "number_prefix" version = "0.4.0" @@ -5544,14 +5472,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa", - "libc", "num-conv", - "num_threads", "powerfmt", "serde", "time-core", - "time-macros", ] [[package]] @@ -5560,16 +5484,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - [[package]] name = "tiny-keccak" version = "2.0.2" diff --git a/Cargo.toml b/Cargo.toml index 4b9fdc257..32f99b050 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,30 +35,30 @@ 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 = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd" } -cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "9c8e97bc1613f6cbd4d0801477d48ee5b79ecafd", features = ["env_logger"] } +cairo-lang-casm = { path = "../cairo/crates/cairo-lang-casm" } +cairo-lang-compiler = { path = "../cairo/crates/cairo-lang-compiler" } +cairo-lang-debug = { path = "../cairo/crates/cairo-lang-debug" } +cairo-lang-defs = { path = "../cairo/crates/cairo-lang-defs" } +cairo-lang-diagnostics = { path = "../cairo/crates/cairo-lang-diagnostics" } +cairo-lang-doc = { path = "../cairo/crates/cairo-lang-doc" } +cairo-lang-filesystem = { path = "../cairo/crates/cairo-lang-filesystem" } +cairo-lang-formatter = { path = "../cairo/crates/cairo-lang-formatter" } +cairo-lang-language-server = { path = "../cairo/crates/cairo-lang-language-server" } +cairo-lang-lowering = { path = "../cairo/crates/cairo-lang-lowering" } +cairo-lang-parser = { path = "../cairo/crates/cairo-lang-parser" } +cairo-lang-project = { path = "../cairo/crates/cairo-lang-project" } +cairo-lang-runner = { path = "../cairo/crates/cairo-lang-runner" } +cairo-lang-semantic = { path = "../cairo/crates/cairo-lang-semantic" } +cairo-lang-sierra = { path = "../cairo/crates/cairo-lang-sierra" } +cairo-lang-sierra-generator = { path = "../cairo/crates/cairo-lang-sierra-generator" } +cairo-lang-sierra-to-casm = { path = "../cairo/crates/cairo-lang-sierra-to-casm" } +cairo-lang-sierra-type-size = { path = "../cairo/crates/cairo-lang-sierra-type-size" } +cairo-lang-starknet = { path = "../cairo/crates/cairo-lang-starknet" } +cairo-lang-starknet-classes = { path = "../cairo/crates/cairo-lang-starknet-classes" } +cairo-lang-syntax = { path = "../cairo/crates/cairo-lang-syntax" } +cairo-lang-test-plugin = { path = "../cairo/crates/cairo-lang-test-plugin" } +cairo-lang-test-runner = { path = "../cairo/crates/cairo-lang-test-runner" } +cairo-lang-utils = { path = "../cairo/crates/cairo-lang-utils" } camino = { version = "1", features = ["serde1"] } cargo_metadata = ">=0.18" clap = { version = "4", features = ["derive", "env", "string"] } diff --git a/extensions/scarb-doc/src/types.rs b/extensions/scarb-doc/src/types.rs index 02273e146..0311ac31b 100644 --- a/extensions/scarb-doc/src/types.rs +++ b/extensions/scarb-doc/src/types.rs @@ -80,11 +80,10 @@ impl Module { module_id: ModuleId, include_private_items: bool, ) -> Self { - // FIXME(#1438): compiler doesn't support fetching root crate doc let item_data = match module_id { ModuleId::CrateRoot(crate_id) => ItemData { name: crate_id.name(db).to_string(), - doc: None, + doc: db.get_item_documentation(DocumentableItemId::Crate(crate_id)), signature: None, full_path: module_id.full_path(db), }, @@ -323,9 +322,7 @@ impl Struct { include_private_items || is_visible_in_module(db, root_module_id, &semantic_member.id) }) - .map(|(_name, semantic_member)| { - Member::new(db, semantic_member.id, item_data.full_path.clone()) - }) + .map(|(_name, semantic_member)| Member::new(db, semantic_member.id)) .collect::>(); let node = id.stable_ptr(db); @@ -349,25 +346,13 @@ pub struct Member { } impl Member { - pub fn new(db: &ScarbDocDatabase, id: MemberId, struct_full_path: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: MemberId) -> Self { let node = id.stable_ptr(db); - let stable_location = StableLocation::new(node.0); - - let name = id.name(db).into(); - // TODO(#1438): Replace with `id.full_path(db)` after it is fixed in the compiler. - let full_path = format!("{}::{}", struct_full_path, name); - - let item_data = ItemData { - name, - doc: get_item_documentation(db, &stable_location), - signature: None, - full_path, - }; Self { id, node, - item_data, + item_data: ItemData::new(db, id, DocumentableItemId::Member(id)), } } } @@ -395,7 +380,7 @@ impl Enum { let variants = variants .iter() - .map(|(_name, variant_id)| Variant::new(db, *variant_id, item_data.full_path.clone())) + .map(|(_name, variant_id)| Variant::new(db, *variant_id)) .collect::>(); let node = id.stable_ptr(db); @@ -419,25 +404,13 @@ pub struct Variant { } impl Variant { - pub fn new(db: &ScarbDocDatabase, id: VariantId, enum_full_path: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: VariantId) -> Self { let node = id.stable_ptr(db); - let stable_location = StableLocation::new(node.0); - - let name = id.name(db).into(); - // TODO(#1438): Replace with `id.full_path(db)` after it is fixed in the compiler. - let full_path = format!("{}::{}", enum_full_path, name); - - let item_data = ItemData { - name, - doc: get_item_documentation(db, &stable_location), - signature: None, - full_path, - }; Self { id, node, - item_data, + item_data: ItemData::new(db, id, DocumentableItemId::Variant(id)), } } } @@ -513,26 +486,17 @@ impl Trait { id, LookupItemId::ModuleItem(ModuleItemId::Trait(id)).into(), ); - let full_path_to_trait = item_data - .full_path - .strip_suffix(item_data.name.as_str()) - .unwrap() - .to_string(); let trait_constants = db.trait_constants(id).unwrap(); let trait_constants = trait_constants .iter() - .map(|(_name, trait_constant_id)| { - TraitConstant::new(db, *trait_constant_id, full_path_to_trait.clone()) - }) + .map(|(_name, trait_constant_id)| TraitConstant::new(db, *trait_constant_id)) .collect::>(); let trait_types = db.trait_types(id).unwrap(); let trait_types = trait_types .iter() - .map(|(_name, trait_type_id)| { - TraitType::new(db, *trait_type_id, full_path_to_trait.clone()) - }) + .map(|(_name, trait_type_id)| TraitType::new(db, *trait_type_id)) .collect::>(); let trait_functions = db.trait_functions(id).unwrap(); @@ -564,21 +528,17 @@ pub struct TraitConstant { } impl TraitConstant { - pub fn new(db: &ScarbDocDatabase, id: TraitConstantId, full_path_to_trait: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: TraitConstantId) -> Self { let node = id.stable_ptr(db); - let mut item_data = ItemData::new( - db, - id, - LookupItemId::TraitItem(TraitItemId::Constant(id)).into(), - ); - // TODO(#1438): introduce proper fix in compiler - item_data.full_path = full_path_to_trait + &item_data.full_path; - Self { id, node, - item_data, + item_data: ItemData::new( + db, + id, + LookupItemId::TraitItem(TraitItemId::Constant(id)).into(), + ), } } } @@ -594,21 +554,17 @@ pub struct TraitType { } impl TraitType { - pub fn new(db: &ScarbDocDatabase, id: TraitTypeId, full_path_to_trait: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: TraitTypeId) -> Self { let node = id.stable_ptr(db); - let mut item_data = ItemData::new( - db, - id, - LookupItemId::TraitItem(TraitItemId::Type(id)).into(), - ); - // TODO(#1438): introduce proper fix in compiler - item_data.full_path = full_path_to_trait + &item_data.full_path; - Self { id, node, - item_data, + item_data: ItemData::new( + db, + id, + LookupItemId::TraitItem(TraitItemId::Type(id)).into(), + ), } } } @@ -660,22 +616,17 @@ impl Impl { id, LookupItemId::ModuleItem(ModuleItemId::Impl(id)).into(), ); - let full_path_to_impl = item_data - .full_path - .strip_suffix(item_data.name.as_str()) - .unwrap() - .to_string(); let impl_types = db.impl_types(id).unwrap(); let impl_types = impl_types .iter() - .map(|(id, _)| ImplType::new(db, *id, full_path_to_impl.clone())) + .map(|(id, _)| ImplType::new(db, *id)) .collect::>(); let impl_constants = db.impl_constants(id).unwrap(); let impl_constants = impl_constants .iter() - .map(|(id, _)| ImplConstant::new(db, *id, full_path_to_impl.clone())) + .map(|(id, _)| ImplConstant::new(db, *id)) .collect::>(); let impl_functions = db.impl_functions(id).unwrap(); @@ -707,18 +658,13 @@ pub struct ImplType { } impl ImplType { - pub fn new(db: &ScarbDocDatabase, id: ImplTypeDefId, full_path_to_impl: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: ImplTypeDefId) -> Self { let node = id.stable_ptr(db); - let mut item_data = - ItemData::new(db, id, LookupItemId::ImplItem(ImplItemId::Type(id)).into()); - // TODO(#1438): introduce proper fix in compiler - item_data.full_path = full_path_to_impl + &item_data.full_path; - Self { id, node, - item_data, + item_data: ItemData::new(db, id, LookupItemId::ImplItem(ImplItemId::Type(id)).into()), } } } @@ -734,21 +680,17 @@ pub struct ImplConstant { } impl ImplConstant { - pub fn new(db: &ScarbDocDatabase, id: ImplConstantDefId, full_path_to_impl: String) -> Self { + pub fn new(db: &ScarbDocDatabase, id: ImplConstantDefId) -> Self { let node = id.stable_ptr(db); - let mut item_data = ItemData::new( - db, - id, - LookupItemId::ImplItem(ImplItemId::Constant(id)).into(), - ); - // TODO(#1438): introduce proper fix in compiler - item_data.full_path = full_path_to_impl + &item_data.full_path; - Self { id, node, - item_data, + item_data: ItemData::new( + db, + id, + LookupItemId::ImplItem(ImplItemId::Constant(id)).into(), + ), } } } diff --git a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Circle.md b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Circle.md index 206c8c3a4..0217f7b92 100644 --- a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Circle.md +++ b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Circle.md @@ -12,4 +12,8 @@ Radius of the circle Fully qualified path: `hello_world::Circle::radius` +```rust + radius: u32 +``` + diff --git a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Shape.md b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Shape.md index c0b8a4fec..33e3b8a7d 100644 --- a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Shape.md +++ b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world-Shape.md @@ -27,7 +27,7 @@ const SHAPE_CONST: felt252; Calculate the area of the shape -Fully qualified path: `Shape::area` +Fully qualified path: `hello_world::Shape::area` ```rust fn area(self: T) -> u32 diff --git a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world.md b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world.md index b17728f49..e6cacb9bf 100644 --- a/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world.md +++ b/extensions/scarb-doc/tests/data/hello_world_no_features/src/hello_world.md @@ -1,5 +1,8 @@ # hello_world +Fibonacci sequence calculator + + Fully qualified path: `hello_world` ## Modules diff --git a/extensions/scarb-doc/tests/data/hello_world_sub_package_no_features/src/hello_world_sub_package.md b/extensions/scarb-doc/tests/data/hello_world_sub_package_no_features/src/hello_world_sub_package.md index 298cacd69..4e934703c 100644 --- a/extensions/scarb-doc/tests/data/hello_world_sub_package_no_features/src/hello_world_sub_package.md +++ b/extensions/scarb-doc/tests/data/hello_world_sub_package_no_features/src/hello_world_sub_package.md @@ -1,5 +1,8 @@ # hello_world_sub_package +Sub-package code (without feature) + + Fully qualified path: `hello_world_sub_package` ## Free functions diff --git a/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package.md b/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package.md index 298cacd69..5c0cff0f7 100644 --- a/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package.md +++ b/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package.md @@ -1,5 +1,8 @@ # hello_world_sub_package +Sub-package code (with feature) + + Fully qualified path: `hello_world_sub_package` ## Free functions diff --git a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Circle.md b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Circle.md index 206c8c3a4..0217f7b92 100644 --- a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Circle.md +++ b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Circle.md @@ -12,4 +12,8 @@ Radius of the circle Fully qualified path: `hello_world::Circle::radius` +```rust + radius: u32 +``` + diff --git a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Shape.md b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Shape.md index c0b8a4fec..33e3b8a7d 100644 --- a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Shape.md +++ b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world-Shape.md @@ -27,7 +27,7 @@ const SHAPE_CONST: felt252; Calculate the area of the shape -Fully qualified path: `Shape::area` +Fully qualified path: `hello_world::Shape::area` ```rust fn area(self: T) -> u32 diff --git a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world.md b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world.md index 0dcbc9921..74862f90f 100644 --- a/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world.md +++ b/extensions/scarb-doc/tests/data/hello_world_with_features/src/hello_world.md @@ -1,5 +1,8 @@ # hello_world +Fibonacci sequence calculator + + Fully qualified path: `hello_world` ## Modules diff --git a/extensions/scarb-doc/tests/data/json_output_test_data.json b/extensions/scarb-doc/tests/data/json_output_test_data.json index 5a5e87c34..a6d3a0b02 100644 --- a/extensions/scarb-doc/tests/data/json_output_test_data.json +++ b/extensions/scarb-doc/tests/data/json_output_test_data.json @@ -6,7 +6,7 @@ "root_module": { "item_data": { "name": "hello_world", - "doc": null, + "doc": "Fibonacci sequence calculator\n", "signature": null, "full_path": "hello_world" }, @@ -75,7 +75,7 @@ "item_data": { "name": "radius", "doc": "Radius of the circle", - "signature": null, + "signature": " radius: u32", "full_path": "hello_world::Circle::radius" } } @@ -95,7 +95,7 @@ "item_data": { "name": "Red", "doc": "Red color", - "signature": null, + "signature": "", "full_path": "hello_world::Color::Red" } }, @@ -103,7 +103,7 @@ "item_data": { "name": "Green", "doc": "Green color", - "signature": null, + "signature": "", "full_path": "hello_world::Color::Green" } }, @@ -111,7 +111,7 @@ "item_data": { "name": "Blue", "doc": "Blue color", - "signature": null, + "signature": "", "full_path": "hello_world::Color::Blue" } } @@ -163,7 +163,7 @@ "name": "area", "doc": "Calculate the area of the shape", "signature": "fn area(self: T) -> u32", - "full_path": "Shape::area" + "full_path": "hello_world::Shape::area" } } ], diff --git a/extensions/scarb-doc/tests/data/json_private_items_excluded.json b/extensions/scarb-doc/tests/data/json_private_items_excluded.json index 43c85fc0b..89efa8732 100644 --- a/extensions/scarb-doc/tests/data/json_private_items_excluded.json +++ b/extensions/scarb-doc/tests/data/json_private_items_excluded.json @@ -73,7 +73,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -91,7 +91,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -165,7 +165,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -183,7 +183,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -250,7 +250,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -268,7 +268,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -350,7 +350,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -368,7 +368,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -442,7 +442,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -460,7 +460,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -527,7 +527,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -545,7 +545,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -627,7 +627,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -645,7 +645,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -719,7 +719,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -737,7 +737,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -804,7 +804,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -822,7 +822,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -914,7 +914,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicEnum::PUBLIC_VARIANT" } } @@ -932,7 +932,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateEnum::PUBLIC_VARIANT" } } @@ -950,7 +950,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateEnum::PRIVATE_VARIANT" } } diff --git a/extensions/scarb-doc/tests/data/json_private_items_included.json b/extensions/scarb-doc/tests/data/json_private_items_included.json index 36b349022..71e862727 100644 --- a/extensions/scarb-doc/tests/data/json_private_items_included.json +++ b/extensions/scarb-doc/tests/data/json_private_items_included.json @@ -61,7 +61,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicChildStructure::public_field" } }, @@ -69,7 +69,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicChildStructure::public_crate_field" } }, @@ -77,7 +77,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicChildStructure::private_field" } } @@ -95,7 +95,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildStructure::public_field" } }, @@ -103,7 +103,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildStructure::public_crate_field" } }, @@ -111,7 +111,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildStructure::private_field" } } @@ -129,7 +129,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PrivateChildStructure::public_field" } }, @@ -137,7 +137,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PrivateChildStructure::public_crate_field" } }, @@ -145,7 +145,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicChild::PrivateChildStructure::private_field" } } @@ -165,7 +165,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -183,7 +183,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -201,7 +201,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -263,7 +263,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildStructure::public_field" } }, @@ -271,7 +271,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildStructure::public_crate_field" } }, @@ -279,7 +279,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildStructure::private_field" } } @@ -297,7 +297,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildStructure::public_field" } }, @@ -305,7 +305,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -313,7 +313,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildStructure::private_field" } } @@ -331,7 +331,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PrivateChildStructure::public_field" } }, @@ -339,7 +339,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PrivateChildStructure::public_crate_field" } }, @@ -347,7 +347,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateChild::PrivateChildStructure::private_field" } } @@ -367,7 +367,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -385,7 +385,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -403,7 +403,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -465,7 +465,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicChildStructure::public_field" } }, @@ -473,7 +473,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicChildStructure::public_crate_field" } }, @@ -481,7 +481,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicChildStructure::private_field" } } @@ -499,7 +499,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicCrateChildStructure::public_field" } }, @@ -507,7 +507,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -515,7 +515,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PublicCrateChildStructure::private_field" } } @@ -533,7 +533,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PrivateChildStructure::public_field" } }, @@ -541,7 +541,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PrivateChildStructure::public_crate_field" } }, @@ -549,7 +549,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PrivateChild::PrivateChildStructure::private_field" } } @@ -569,7 +569,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PrivateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -587,7 +587,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PrivateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -605,7 +605,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PrivateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -660,7 +660,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicParentStructure::public_field" } }, @@ -668,7 +668,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicParentStructure::public_crate_field" } }, @@ -676,7 +676,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicParentStructure::private_field" } } @@ -694,7 +694,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateParentStructure::public_field" } }, @@ -702,7 +702,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateParentStructure::public_crate_field" } }, @@ -710,7 +710,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PublicCrateParentStructure::private_field" } } @@ -728,7 +728,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicParent::PrivateParentStructure::public_field" } }, @@ -736,7 +736,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicParent::PrivateParentStructure::public_crate_field" } }, @@ -744,7 +744,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicParent::PrivateParentStructure::private_field" } } @@ -764,7 +764,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -782,7 +782,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -800,7 +800,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicParent::PrivateParentEnum::PRIVATE_VARIANT" } } @@ -870,7 +870,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildStructure::public_field" } }, @@ -878,7 +878,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildStructure::public_crate_field" } }, @@ -886,7 +886,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildStructure::private_field" } } @@ -904,7 +904,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildStructure::public_field" } }, @@ -912,7 +912,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildStructure::public_crate_field" } }, @@ -920,7 +920,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildStructure::private_field" } } @@ -938,7 +938,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PrivateChildStructure::public_field" } }, @@ -946,7 +946,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PrivateChildStructure::public_crate_field" } }, @@ -954,7 +954,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicChild::PrivateChildStructure::private_field" } } @@ -974,7 +974,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -992,7 +992,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -1010,7 +1010,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -1072,7 +1072,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildStructure::public_field" } }, @@ -1080,7 +1080,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildStructure::public_crate_field" } }, @@ -1088,7 +1088,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildStructure::private_field" } } @@ -1106,7 +1106,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildStructure::public_field" } }, @@ -1114,7 +1114,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -1122,7 +1122,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildStructure::private_field" } } @@ -1140,7 +1140,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PrivateChildStructure::public_field" } }, @@ -1148,7 +1148,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PrivateChildStructure::public_crate_field" } }, @@ -1156,7 +1156,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PrivateChildStructure::private_field" } } @@ -1176,7 +1176,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -1194,7 +1194,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -1212,7 +1212,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -1274,7 +1274,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicChildStructure::public_field" } }, @@ -1282,7 +1282,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicChildStructure::public_crate_field" } }, @@ -1290,7 +1290,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicChildStructure::private_field" } } @@ -1308,7 +1308,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicCrateChildStructure::public_field" } }, @@ -1316,7 +1316,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -1324,7 +1324,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicCrateChildStructure::private_field" } } @@ -1342,7 +1342,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PrivateChildStructure::public_field" } }, @@ -1350,7 +1350,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PrivateChildStructure::public_crate_field" } }, @@ -1358,7 +1358,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateChild::PrivateChildStructure::private_field" } } @@ -1378,7 +1378,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -1396,7 +1396,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -1414,7 +1414,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PrivateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -1469,7 +1469,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicParentStructure::public_field" } }, @@ -1477,7 +1477,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicParentStructure::public_crate_field" } }, @@ -1485,7 +1485,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicParentStructure::private_field" } } @@ -1503,7 +1503,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateParentStructure::public_field" } }, @@ -1511,7 +1511,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateParentStructure::public_crate_field" } }, @@ -1519,7 +1519,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PublicCrateParentStructure::private_field" } } @@ -1537,7 +1537,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateParentStructure::public_field" } }, @@ -1545,7 +1545,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateParentStructure::public_crate_field" } }, @@ -1553,7 +1553,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateParent::PrivateParentStructure::private_field" } } @@ -1573,7 +1573,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -1591,7 +1591,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -1609,7 +1609,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateParent::PrivateParentEnum::PRIVATE_VARIANT" } } @@ -1679,7 +1679,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicChildStructure::public_field" } }, @@ -1687,7 +1687,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicChildStructure::public_crate_field" } }, @@ -1695,7 +1695,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicChildStructure::private_field" } } @@ -1713,7 +1713,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildStructure::public_field" } }, @@ -1721,7 +1721,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildStructure::public_crate_field" } }, @@ -1729,7 +1729,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildStructure::private_field" } } @@ -1747,7 +1747,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PrivateChildStructure::public_field" } }, @@ -1755,7 +1755,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PrivateChildStructure::public_crate_field" } }, @@ -1763,7 +1763,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicChild::PrivateChildStructure::private_field" } } @@ -1783,7 +1783,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -1801,7 +1801,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -1819,7 +1819,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -1881,7 +1881,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildStructure::public_field" } }, @@ -1889,7 +1889,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildStructure::public_crate_field" } }, @@ -1897,7 +1897,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildStructure::private_field" } } @@ -1915,7 +1915,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildStructure::public_field" } }, @@ -1923,7 +1923,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -1931,7 +1931,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildStructure::private_field" } } @@ -1949,7 +1949,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PrivateChildStructure::public_field" } }, @@ -1957,7 +1957,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PrivateChildStructure::public_crate_field" } }, @@ -1965,7 +1965,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateChild::PrivateChildStructure::private_field" } } @@ -1985,7 +1985,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -2003,7 +2003,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -2021,7 +2021,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -2083,7 +2083,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicChildStructure::public_field" } }, @@ -2091,7 +2091,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicChildStructure::public_crate_field" } }, @@ -2099,7 +2099,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicChildStructure::private_field" } } @@ -2117,7 +2117,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicCrateChildStructure::public_field" } }, @@ -2125,7 +2125,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicCrateChildStructure::public_crate_field" } }, @@ -2133,7 +2133,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PublicCrateChildStructure::private_field" } } @@ -2151,7 +2151,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PrivateChildStructure::public_field" } }, @@ -2159,7 +2159,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PrivateChildStructure::public_crate_field" } }, @@ -2167,7 +2167,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PrivateChild::PrivateChildStructure::private_field" } } @@ -2187,7 +2187,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PrivateChild::PublicChildEnum::PUBLIC_VARIANT" } } @@ -2205,7 +2205,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PrivateChild::PublicCrateChildEnum::PUBLIC_VARIANT" } } @@ -2223,7 +2223,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PrivateChild::PrivateChildEnum::PRIVATE_VARIANT" } } @@ -2278,7 +2278,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicParentStructure::public_field" } }, @@ -2286,7 +2286,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicParentStructure::public_crate_field" } }, @@ -2294,7 +2294,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicParentStructure::private_field" } } @@ -2312,7 +2312,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateParentStructure::public_field" } }, @@ -2320,7 +2320,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateParentStructure::public_crate_field" } }, @@ -2328,7 +2328,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PublicCrateParentStructure::private_field" } } @@ -2346,7 +2346,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateParent::PrivateParentStructure::public_field" } }, @@ -2354,7 +2354,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateParent::PrivateParentStructure::public_crate_field" } }, @@ -2362,7 +2362,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateParent::PrivateParentStructure::private_field" } } @@ -2382,7 +2382,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicParentEnum::PUBLIC_VARIANT" } } @@ -2400,7 +2400,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PublicCrateParentEnum::PUBLIC_VARIANT" } } @@ -2418,7 +2418,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateParent::PrivateParentEnum::PRIVATE_VARIANT" } } @@ -2481,7 +2481,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicStructure::public_field" } }, @@ -2489,7 +2489,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicStructure::public_crate_field" } }, @@ -2497,7 +2497,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicStructure::private_field" } } @@ -2515,7 +2515,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PublicCrateStructure::public_field" } }, @@ -2523,7 +2523,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PublicCrateStructure::public_crate_field" } }, @@ -2531,7 +2531,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PublicCrateStructure::private_field" } } @@ -2549,7 +2549,7 @@ "item_data": { "name": "public_field", "doc": "Public struct field", - "signature": null, + "signature": "pub public_field: felt252", "full_path": "hello_world::PrivateStructure::public_field" } }, @@ -2557,7 +2557,7 @@ "item_data": { "name": "public_crate_field", "doc": "Public crate struct field", - "signature": null, + "signature": "pub(crate) public_crate_field: felt252", "full_path": "hello_world::PrivateStructure::public_crate_field" } }, @@ -2565,7 +2565,7 @@ "item_data": { "name": "private_field", "doc": "Private struct field", - "signature": null, + "signature": " private_field: felt252", "full_path": "hello_world::PrivateStructure::private_field" } } @@ -2585,7 +2585,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicEnum::PUBLIC_VARIANT" } } @@ -2603,7 +2603,7 @@ "item_data": { "name": "PUBLIC_VARIANT", "doc": "Public enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PublicCrateEnum::PUBLIC_VARIANT" } } @@ -2621,7 +2621,7 @@ "item_data": { "name": "PRIVATE_VARIANT", "doc": "Private enum variant", - "signature": null, + "signature": "", "full_path": "hello_world::PrivateEnum::PRIVATE_VARIANT" } } From c083df93088413d00e3c12b0607e15767f6c0298 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalski Date: Thu, 26 Sep 2024 11:33:45 +0200 Subject: [PATCH 3/5] update cairo version --- Cargo.lock | 87 +++++++++++++++++++ Cargo.toml | 48 +++++----- .../scarb-doc/src/metadata/compilation.rs | 11 ++- extensions/scarb-doc/src/types.rs | 32 +------ .../src/metadata.rs | 11 ++- scarb/src/compiler/db.rs | 1 + 6 files changed, 134 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c7856c3c6..eae2a34cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -568,6 +568,7 @@ dependencies = [ [[package]] name = "cairo-lang-casm" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-utils", "indoc", @@ -580,6 +581,7 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "anyhow", "cairo-lang-defs", @@ -604,6 +606,7 @@ dependencies = [ [[package]] name = "cairo-lang-debug" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-utils", ] @@ -611,6 +614,7 @@ dependencies = [ [[package]] name = "cairo-lang-defs" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -626,6 +630,7 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -636,6 +641,7 @@ dependencies = [ [[package]] name = "cairo-lang-doc" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-defs", "cairo-lang-filesystem", @@ -650,6 +656,7 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-utils", "good_lp", @@ -658,6 +665,7 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -666,11 +674,13 @@ dependencies = [ "semver", "serde", "smol_str", + "toml", ] [[package]] name = "cairo-lang-formatter" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -690,6 +700,7 @@ dependencies = [ [[package]] name = "cairo-lang-language-server" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -725,6 +736,7 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -788,6 +800,7 @@ checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf" [[package]] name = "cairo-lang-parser" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -806,6 +819,7 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -823,6 +837,7 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-debug", "quote", @@ -832,6 +847,7 @@ dependencies = [ [[package]] name = "cairo-lang-project" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -844,6 +860,7 @@ dependencies = [ [[package]] name = "cairo-lang-runner" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "ark-ff", "ark-secp256k1", @@ -873,6 +890,7 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -897,6 +915,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "anyhow", "cairo-lang-utils", @@ -922,6 +941,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -936,6 +956,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -950,6 +971,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -972,6 +994,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -991,6 +1014,7 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -999,6 +1023,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1027,6 +1052,7 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1048,6 +1074,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1062,6 +1089,7 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "genco", "xshell", @@ -1070,6 +1098,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1095,6 +1124,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-runner" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1116,6 +1146,7 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1127,14 +1158,18 @@ dependencies = [ [[package]] name = "cairo-lang-utils" version = "2.8.2" +source = "git+https://github.com/starkware-libs/cairo?rev=f982d3cc5e3c216374a9c9605e37efa780e0b4a8#f982d3cc5e3c216374a9c9605e37efa780e0b4a8" dependencies = [ + "env_logger", "hashbrown 0.14.5", "indexmap 2.2.6", "itertools 0.12.1", + "log", "num-bigint", "num-traits 0.2.19", "schemars", "serde", + "time", ] [[package]] @@ -1730,6 +1765,29 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -2985,6 +3043,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c3b1f728c459d27b12448862017b96ad4767b1ec2ec5e6434e99f1577f085b8" +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "hyper" version = "0.14.30" @@ -3728,6 +3792,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -5472,10 +5545,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", + "itoa", + "libc", "num-conv", + "num_threads", "powerfmt", "serde", "time-core", + "time-macros", ] [[package]] @@ -5484,6 +5561,16 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + [[package]] name = "tiny-keccak" version = "2.0.2" diff --git a/Cargo.toml b/Cargo.toml index 32f99b050..d28fcbac2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,30 +35,30 @@ anyhow = "1" assert_fs = "1" async-trait = "0.1" axum = { version = "0.6", features = ["http2"] } -cairo-lang-casm = { path = "../cairo/crates/cairo-lang-casm" } -cairo-lang-compiler = { path = "../cairo/crates/cairo-lang-compiler" } -cairo-lang-debug = { path = "../cairo/crates/cairo-lang-debug" } -cairo-lang-defs = { path = "../cairo/crates/cairo-lang-defs" } -cairo-lang-diagnostics = { path = "../cairo/crates/cairo-lang-diagnostics" } -cairo-lang-doc = { path = "../cairo/crates/cairo-lang-doc" } -cairo-lang-filesystem = { path = "../cairo/crates/cairo-lang-filesystem" } -cairo-lang-formatter = { path = "../cairo/crates/cairo-lang-formatter" } -cairo-lang-language-server = { path = "../cairo/crates/cairo-lang-language-server" } -cairo-lang-lowering = { path = "../cairo/crates/cairo-lang-lowering" } -cairo-lang-parser = { path = "../cairo/crates/cairo-lang-parser" } -cairo-lang-project = { path = "../cairo/crates/cairo-lang-project" } -cairo-lang-runner = { path = "../cairo/crates/cairo-lang-runner" } -cairo-lang-semantic = { path = "../cairo/crates/cairo-lang-semantic" } -cairo-lang-sierra = { path = "../cairo/crates/cairo-lang-sierra" } -cairo-lang-sierra-generator = { path = "../cairo/crates/cairo-lang-sierra-generator" } -cairo-lang-sierra-to-casm = { path = "../cairo/crates/cairo-lang-sierra-to-casm" } -cairo-lang-sierra-type-size = { path = "../cairo/crates/cairo-lang-sierra-type-size" } -cairo-lang-starknet = { path = "../cairo/crates/cairo-lang-starknet" } -cairo-lang-starknet-classes = { path = "../cairo/crates/cairo-lang-starknet-classes" } -cairo-lang-syntax = { path = "../cairo/crates/cairo-lang-syntax" } -cairo-lang-test-plugin = { path = "../cairo/crates/cairo-lang-test-plugin" } -cairo-lang-test-runner = { path = "../cairo/crates/cairo-lang-test-runner" } -cairo-lang-utils = { path = "../cairo/crates/cairo-lang-utils" } +cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8" } +cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "f982d3cc5e3c216374a9c9605e37efa780e0b4a8", features = ["env_logger"] } camino = { version = "1", features = ["serde1"] } cargo_metadata = ">=0.18" clap = { version = "4", features = ["derive", "env", "string"] } diff --git a/extensions/scarb-doc/src/metadata/compilation.rs b/extensions/scarb-doc/src/metadata/compilation.rs index 7223c6490..600904f31 100644 --- a/extensions/scarb-doc/src/metadata/compilation.rs +++ b/extensions/scarb-doc/src/metadata/compilation.rs @@ -6,7 +6,9 @@ use std::path::PathBuf; use cairo_lang_compiler::project::{AllCratesConfig, ProjectConfig, ProjectConfigContent}; use cairo_lang_filesystem::cfg::{Cfg, CfgSet}; -use cairo_lang_filesystem::db::{CrateSettings, Edition, ExperimentalFeaturesConfig}; +use cairo_lang_filesystem::db::{ + CrateSettings, DependencySettings, Edition, ExperimentalFeaturesConfig, +}; use cairo_lang_filesystem::ids::Directory; use cairo_lang_utils::ordered_hash_map::OrderedHashMap; use itertools::Itertools; @@ -131,10 +133,17 @@ fn get_crate_settings_for_package( .contains(&String::from("coupons")), }; + let dependencies = package + .dependencies + .iter() + .map(|d| (d.name.clone(), DependencySettings { version: None })) + .collect(); + CrateSettings { edition, cfg_set, experimental_features, + dependencies, version: Some(package.version.clone()), } } diff --git a/extensions/scarb-doc/src/types.rs b/extensions/scarb-doc/src/types.rs index 0311ac31b..3eae0efdb 100644 --- a/extensions/scarb-doc/src/types.rs +++ b/extensions/scarb-doc/src/types.rs @@ -1,16 +1,13 @@ use cairo_lang_semantic::items::visibility; use cairo_lang_utils::Upcast; -use itertools::Itertools; use serde::Serialize; use cairo_lang_defs::db::DefsGroup; -use cairo_lang_defs::diagnostic_utils::StableLocation; use cairo_lang_defs::ids::{ ConstantId, EnumId, ExternFunctionId, ExternTypeId, FreeFunctionId, ImplAliasId, ImplConstantDefId, ImplDefId, ImplFunctionId, ImplItemId, ImplTypeDefId, LookupItemId, - MemberId, ModuleId, ModuleItemId, ModuleTypeAliasId, NamedLanguageElementId, StructId, - TopLevelLanguageElementId, TraitConstantId, TraitFunctionId, TraitId, TraitItemId, TraitTypeId, - VariantId, + MemberId, ModuleId, ModuleItemId, ModuleTypeAliasId, StructId, TopLevelLanguageElementId, + TraitConstantId, TraitFunctionId, TraitId, TraitItemId, TraitTypeId, VariantId, }; use cairo_lang_doc::db::DocGroup; use cairo_lang_doc::documentable_item::DocumentableItemId; @@ -770,28 +767,3 @@ impl ExternFunction { } } } - -// TODO(#1428): This function is temporarily copied until further modifications in cairo compiler are done. -fn get_item_documentation(db: &dyn DefsGroup, stable_location: &StableLocation) -> Option { - let doc = stable_location.syntax_node(db).get_text(db.upcast()); - let doc = doc - .lines() - .take_while_ref(|line| { - !line - .trim_start() - .chars() - .next() - .map_or(false, |c| c.is_alphabetic()) - }) - .filter_map(|line| { - let dedent = line.trim_start(); - for prefix in ["///", "//!"] { - if let Some(content) = dedent.strip_prefix(prefix) { - return Some(content.strip_prefix(' ').unwrap_or(content)); - } - } - None - }) - .collect::>(); - (!doc.is_empty()).then(|| doc.join("\n")) -} diff --git a/extensions/scarb-snforge-test-collector/src/metadata.rs b/extensions/scarb-snforge-test-collector/src/metadata.rs index 2c6ad87f5..dc286891f 100644 --- a/extensions/scarb-snforge-test-collector/src/metadata.rs +++ b/extensions/scarb-snforge-test-collector/src/metadata.rs @@ -1,6 +1,8 @@ use anyhow::{anyhow, ensure, Context, Result}; use cairo_lang_filesystem::cfg::{Cfg, CfgSet}; -use cairo_lang_filesystem::db::{CrateSettings, Edition, ExperimentalFeaturesConfig}; +use cairo_lang_filesystem::db::{ + CrateSettings, DependencySettings, Edition, ExperimentalFeaturesConfig, +}; use cairo_lang_project::AllCratesConfig; use cairo_lang_utils::ordered_hash_map::OrderedHashMap; use camino::{Utf8Path, Utf8PathBuf}; @@ -226,10 +228,17 @@ fn get_crate_settings_for_package( .contains(&String::from("coupons")), }; + let dependencies = package + .dependencies + .iter() + .map(|d| (d.name.clone(), DependencySettings { version: None })) + .collect(); + CrateSettings { edition, cfg_set, experimental_features, + dependencies, version: Some(package.version.clone()), } } diff --git a/scarb/src/compiler/db.rs b/scarb/src/compiler/db.rs index 761e69d02..2583218b6 100644 --- a/scarb/src/compiler/db.rs +++ b/scarb/src/compiler/db.rs @@ -139,6 +139,7 @@ fn build_project_config(unit: &CairoCompilationUnit) -> Result { CrateSettings { edition: component.package.manifest.edition, cfg_set: component.cfg_set.clone(), + dependencies: Default::default(), version: Some(component.package.id.version.clone()), // TODO (#1040): replace this with a macro experimental_features: cairo_lang_filesystem::db::ExperimentalFeaturesConfig { From e8c70fca897a4f40f0b760a81e8f4893186119d8 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalski Date: Mon, 30 Sep 2024 11:31:04 +0200 Subject: [PATCH 4/5] clippy fix --- extensions/scarb-doc/src/types.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/scarb-doc/src/types.rs b/extensions/scarb-doc/src/types.rs index bf2c26b39..dc007f3ef 100644 --- a/extensions/scarb-doc/src/types.rs +++ b/extensions/scarb-doc/src/types.rs @@ -7,7 +7,7 @@ use cairo_lang_defs::db::DefsGroup; use cairo_lang_defs::ids::{ ConstantId, EnumId, ExternFunctionId, ExternTypeId, FreeFunctionId, ImplAliasId, ImplConstantDefId, ImplDefId, ImplFunctionId, ImplItemId, ImplTypeDefId, LanguageElementId, - LookupItemId, MemberId, ModuleId, ModuleItemId, ModuleTypeAliasId, NamedLanguageElementId, + LookupItemId, MemberId, ModuleId, ModuleItemId, ModuleTypeAliasId, StructId, TopLevelLanguageElementId, TraitConstantId, TraitFunctionId, TraitId, TraitItemId, TraitTypeId, VariantId, }; From c08b9118860ae5173398ae6f1650ca06d21baf90 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalski Date: Mon, 30 Sep 2024 11:33:37 +0200 Subject: [PATCH 5/5] Rust fmt fix --- extensions/scarb-doc/src/types.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/scarb-doc/src/types.rs b/extensions/scarb-doc/src/types.rs index dc007f3ef..6fefc37f8 100644 --- a/extensions/scarb-doc/src/types.rs +++ b/extensions/scarb-doc/src/types.rs @@ -7,9 +7,9 @@ use cairo_lang_defs::db::DefsGroup; use cairo_lang_defs::ids::{ ConstantId, EnumId, ExternFunctionId, ExternTypeId, FreeFunctionId, ImplAliasId, ImplConstantDefId, ImplDefId, ImplFunctionId, ImplItemId, ImplTypeDefId, LanguageElementId, - LookupItemId, MemberId, ModuleId, ModuleItemId, ModuleTypeAliasId, - StructId, TopLevelLanguageElementId, TraitConstantId, TraitFunctionId, TraitId, TraitItemId, - TraitTypeId, VariantId, + LookupItemId, MemberId, ModuleId, ModuleItemId, ModuleTypeAliasId, StructId, + TopLevelLanguageElementId, TraitConstantId, TraitFunctionId, TraitId, TraitItemId, TraitTypeId, + VariantId, }; use cairo_lang_doc::db::DocGroup; use cairo_lang_doc::documentable_item::DocumentableItemId;