post-rebase fix

Author: DelevoXDG

Cargo.lock

@@ -32,7 +32,7 @@ scarb-metadata = { path = "../../scarb-metadata" }
 scarb-build-metadata = { path = "../../utils/scarb-build-metadata" }
 scarb-ui = { path = "../../utils/scarb-ui" }
 scarb-extensions-cli = { path = "../../utils/scarb-extensions-cli", default-features = false, features = ["doc"] }
-scarb-execute-utils = { path = "../../utils/scarb-execute-utils" }
+scarb-fs-utils = { path = "../../utils/scarb-fs-utils" }
 serde.workspace = true
 serde_json.workspace = true
 salsa.workspace = true

extensions/scarb-doc/Cargo.toml

@@ -4,9 +4,8 @@ use crate::doc_test::ui::TestResult;
 use crate::doc_test::workspace::TestWorkspace;
 use anyhow::Result;
 use create_output_dir::create_output_dir;
-use scarb_execute_utils::{
-    EXECUTE_PRINT_OUTPUT_FILENAME, EXECUTE_PROGRAM_OUTPUT_FILENAME,
-    incremental_create_execution_output_dir,
+use scarb_fs_utils::{
+    EXECUTE_PRINT_OUTPUT_FILENAME, EXECUTE_PROGRAM_OUTPUT_FILENAME, incremental_create_dir_unique,
 };
 use scarb_metadata::ScarbCommand;
 use scarb_ui::Ui;
@@ -212,7 +211,7 @@ impl<'a> TestRunner<'a> {
 
         let output_dir = target_dir.join("execute").join(ws.package_name());
         create_output_dir(output_dir.as_std_path())?;
-        let (output_dir, execution_id) = incremental_create_execution_output_dir(&output_dir)?;
+        let (output_dir, execution_id) = incremental_create_dir_unique(&output_dir, "execution")?;
 
         let run_result = ScarbCommand::new()
             .arg("execute")

extensions/scarb-doc/src/doc_test/runner.rs

@@ -2,18 +2,21 @@ use crate::db::ScarbDocDatabase;
 use crate::docs_generation::markdown::context::IncludedItems;
 use crate::docs_generation::markdown::traits::WithItemDataCommon;
 use crate::types::item_data::{ItemData, SubItemData};
+use crate::types::module_type::is_doc_hidden_attr;
 use cairo_lang_defs::ids::NamedLanguageElementId;
 use cairo_lang_defs::ids::{
     ConstantId, EnumId, ExternFunctionId, ExternTypeId, FreeFunctionId, ImplAliasId,
     ImplConstantDefId, ImplDefId, ImplFunctionId, ImplItemId, ImplTypeDefId, LanguageElementId,
-    LookupItemId, MacroDeclarationId, ModuleId, ModuleItemId, ModuleTypeAliasId, TraitConstantId,
-    TraitFunctionId, TraitId, TraitItemId, TraitTypeId, VariantId,
+    LookupItemId, MacroDeclarationId, MemberId, ModuleId, ModuleItemId, ModuleTypeAliasId,
+    StructId, TraitConstantId, TraitFunctionId, TraitId, TraitItemId, TraitTypeId, VariantId,
 };
 use cairo_lang_diagnostics::Maybe;
 use cairo_lang_doc::documentable_item::DocumentableItemId;
 use cairo_lang_semantic::items::enm::EnumSemantic;
 use cairo_lang_semantic::items::imp::ImplSemantic;
+use cairo_lang_semantic::items::structure::StructSemantic;
 use cairo_lang_semantic::items::trt::TraitSemantic;
+use cairo_lang_semantic::items::visibility::Visibility;
 use cairo_lang_syntax::node::ast;
 use serde::Serialize;
 use std::collections::HashMap;

extensions/scarb-doc/src/types/other_types.rs

@@ -1,6 +1,6 @@
 use crate::db::ScarbDocDatabase;
 use crate::docs_generation::markdown::context::IncludedItems;
-use crate::docs_generation::markdown::traits::WithPath;
+use crate::docs_generation::markdown::traits::WithItemDataCommon;
 use crate::location_links::DocLocationLink;
 use crate::types::item_data::{ItemData, SubItemData};
 use crate::types::module_type::is_doc_hidden_attr;
@@ -61,7 +61,12 @@ impl<'db> Struct<'db> {
     pub fn get_all_item_ids<'a>(&'a self) -> IncludedItems<'a, 'db> {
         self.members
             .iter()
-            .map(|item| (item.item_data.id, &item.item_data as &dyn WithPath))
+            .map(|item| {
+                (
+                    item.item_data.id,
+                    &item.item_data as &dyn WithItemDataCommon,
+                )
+            })
             .collect()
     }
 }