From 98d8fbf752205afd87cc6648974bec8d6cfc2350 Mon Sep 17 00:00:00 2001 From: Azriel Hoh Date: Mon, 3 Jun 2024 11:48:07 +1200 Subject: [PATCH 1/6] Replace `peace_resources_rt` with `peace_resource_rt`. --- crate/cfg/Cargo.toml | 2 +- crate/cfg/src/accessors/stored.rs | 2 +- crate/cfg/src/item.rs | 2 +- crate/cmd/Cargo.toml | 2 +- crate/cmd/src/ctx/cmd_ctx_builder.rs | 6 +- crate/cmd/src/scopes/multi_profile_no_flow.rs | 2 +- .../src/scopes/multi_profile_single_flow.rs | 20 ++--- crate/cmd/src/scopes/no_profile_no_flow.rs | 2 +- .../cmd/src/scopes/single_profile_no_flow.rs | 2 +- .../src/scopes/single_profile_single_flow.rs | 20 ++--- crate/cmd_rt/Cargo.toml | 2 +- crate/cmd_rt/src/cmd_block.rs | 2 +- crate/cmd_rt/src/cmd_block/cmd_block_error.rs | 2 +- .../cmd_rt/src/cmd_block/cmd_block_wrapper.rs | 2 +- crate/cmd_rt/src/cmd_execution.rs | 2 +- .../cmd_execution/cmd_execution_builder.rs | 2 +- .../cmd_execution_error_builder.rs | 2 +- crate/code_gen/src/cmd/impl_build.rs | 74 +++++++++---------- .../src/cmd/impl_params_deserialize.rs | 4 +- crate/code_gen/src/cmd/impl_params_merge.rs | 4 +- crate/core/src/lib.rs | 4 +- crate/params/Cargo.toml | 2 +- crate/params/src/any_spec_data_type.rs | 2 +- crate/params/src/any_spec_rt_boxed.rs | 2 +- crate/params/src/field_wise_spec_rt.rs | 2 +- crate/params/src/mapping_fn.rs | 2 +- crate/params/src/mapping_fn_impl.rs | 2 +- crate/params/src/params_spec.rs | 4 +- crate/params/src/params_spec_fieldless.rs | 4 +- crate/params/src/params_specs.rs | 2 +- crate/params/src/value_spec.rs | 4 +- crate/params/src/value_spec_rt.rs | 2 +- .../impl_field_wise_spec_rt_for_field_wise.rs | 6 +- ...ld_wise_spec_rt_for_field_wise_external.rs | 18 ++--- .../src/impl_value_spec_rt_for_field_wise.rs | 6 +- crate/params_derive/src/lib.rs | 20 ++--- crate/resources_rt/Cargo.toml | 4 +- crate/rt/Cargo.toml | 2 +- .../rt/src/cmd_blocks/apply_exec_cmd_block.rs | 2 +- .../apply_state_sync_check_cmd_block.rs | 2 +- crate/rt/src/cmd_blocks/diff_cmd_block.rs | 2 +- .../states_clean_insertion_cmd_block.rs | 2 +- .../states_current_read_cmd_block.rs | 2 +- .../cmd_blocks/states_discover_cmd_block.rs | 2 +- .../cmd_blocks/states_goal_read_cmd_block.rs | 2 +- crate/rt/src/cmds/clean_cmd.rs | 2 +- crate/rt/src/cmds/diff_cmd.rs | 2 +- crate/rt/src/cmds/ensure_cmd.rs | 2 +- crate/rt/src/cmds/states_current_read_cmd.rs | 2 +- .../cmds/states_current_stored_display_cmd.rs | 2 +- crate/rt/src/cmds/states_discover_cmd.rs | 2 +- crate/rt/src/cmds/states_goal_display_cmd.rs | 2 +- crate/rt/src/cmds/states_goal_read_cmd.rs | 2 +- crate/rt_model/Cargo.toml | 2 +- crate/rt_model/src/item_graph.rs | 2 +- crate/rt_model/src/item_rt.rs | 2 +- crate/rt_model/src/item_wrapper.rs | 2 +- crate/rt_model/src/outcomes.rs | 10 +-- crate/rt_model/src/outcomes/item_apply.rs | 2 +- .../src/outcomes/item_apply_partial.rs | 2 +- .../src/outcomes/item_apply_partial_rt.rs | 2 +- crate/rt_model/src/outcomes/item_apply_rt.rs | 2 +- crate/rt_model/src/params_specs_serializer.rs | 2 +- crate/rt_model/src/params_specs_type_reg.rs | 4 +- crate/rt_model/src/states_serializer.rs | 10 +-- crate/rt_model/src/states_type_reg.rs | 10 +-- crate/rt_model_core/Cargo.toml | 2 +- crate/rt_model_core/src/error.rs | 2 +- crate/rt_model_core/src/error/native_error.rs | 2 +- .../src/params/params_type_regs.rs | 6 +- .../src/params/params_type_regs_builder.rs | 6 +- crate/rt_model_native/Cargo.toml | 2 +- crate/rt_model_native/src/storage.rs | 2 +- crate/rt_model_native/src/workspace.rs | 2 +- .../src/workspace_dirs_builder.rs | 4 +- .../src/workspace_initializer.rs | 2 +- crate/rt_model_web/Cargo.toml | 2 +- crate/rt_model_web/src/storage.rs | 2 +- crate/rt_model_web/src/workspace.rs | 2 +- .../src/workspace_dirs_builder.rs | 2 +- .../rt_model_web/src/workspace_initializer.rs | 2 +- 81 files changed, 183 insertions(+), 183 deletions(-) diff --git a/crate/cfg/Cargo.toml b/crate/cfg/Cargo.toml index bddca464a..f59753caa 100644 --- a/crate/cfg/Cargo.toml +++ b/crate/cfg/Cargo.toml @@ -26,7 +26,7 @@ enser = { workspace = true } peace_core = { workspace = true } peace_data = { workspace = true } peace_params = { workspace = true } -peace_resources_rt = { workspace = true } +peace_resource_rt = { workspace = true } serde = { workspace = true, features = ["derive"] } tynm = { workspace = true } diff --git a/crate/cfg/src/accessors/stored.rs b/crate/cfg/src/accessors/stored.rs index e720111ec..c4c821429 100644 --- a/crate/cfg/src/accessors/stored.rs +++ b/crate/cfg/src/accessors/stored.rs @@ -12,7 +12,7 @@ use peace_data::{ }, Data, }; -use peace_resources_rt::{states::StatesCurrentStored, type_reg::untagged::DataType}; +use peace_resource_rt::{states::StatesCurrentStored, type_reg::untagged::DataType}; use serde::Serialize; /// The previously stored `T` state, if any. diff --git a/crate/cfg/src/item.rs b/crate/cfg/src/item.rs index 1c70c3925..d5a74e184 100644 --- a/crate/cfg/src/item.rs +++ b/crate/cfg/src/item.rs @@ -5,7 +5,7 @@ use dyn_clone::DynClone; use peace_core::{ApplyCheck, ItemId}; use peace_data::Data; use peace_params::{Params, ParamsSpec}; -use peace_resources_rt::{resources::ts::Empty, Resources}; +use peace_resource_rt::{resources::ts::Empty, Resources}; use serde::{de::DeserializeOwned, Serialize}; use crate::FnCtx; diff --git a/crate/cmd/Cargo.toml b/crate/cmd/Cargo.toml index b761b11e8..163ccb77c 100644 --- a/crate/cmd/Cargo.toml +++ b/crate/cmd/Cargo.toml @@ -29,7 +29,7 @@ peace_cfg = { workspace = true } peace_code_gen = { workspace = true } peace_core = { workspace = true } peace_params = { workspace = true } -peace_resources_rt = { workspace = true } +peace_resource_rt = { workspace = true } peace_rt_model = { workspace = true } peace_value_traits = { workspace = true } serde = { workspace = true } diff --git a/crate/cmd/src/ctx/cmd_ctx_builder.rs b/crate/cmd/src/ctx/cmd_ctx_builder.rs index a05f36e76..0018ba1e5 100644 --- a/crate/cmd/src/ctx/cmd_ctx_builder.rs +++ b/crate/cmd/src/ctx/cmd_ctx_builder.rs @@ -7,7 +7,7 @@ use interruptible::Interruptibility; use own::{OwnedOrMutRef, OwnedOrRef}; use peace_cfg::ItemId; use peace_params::ParamsSpecs; -use peace_resources_rt::{ +use peace_resource_rt::{ internal::{FlowParamsFile, ProfileParamsFile, WorkspaceParamsFile}, paths::ParamsSpecsFile, resources::ts::{Empty, SetUp}, @@ -165,7 +165,7 @@ fn flow_params_insert( #[cfg(not(target_arch = "wasm32"))] pub(crate) async fn profiles_from_peace_app_dir( - peace_app_dir: &peace_resources_rt::paths::PeaceAppDir, + peace_app_dir: &peace_resource_rt::paths::PeaceAppDir, profiles_filter_fn: Option<&dyn Fn(&peace_core::Profile) -> bool>, ) -> Result, peace_rt_model::Error> { use std::{ffi::OsStr, str::FromStr}; @@ -237,7 +237,7 @@ pub(crate) async fn profiles_from_peace_app_dir( #[cfg(target_arch = "wasm32")] pub(crate) async fn profiles_from_peace_app_dir( - _peace_app_dir: &peace_resources_rt::paths::PeaceAppDir, + _peace_app_dir: &peace_resource_rt::paths::PeaceAppDir, _profiles_filter_fn: Option<&dyn Fn(&peace_core::Profile) -> bool>, ) -> Result, peace_rt_model::Error> { let profiles = Vec::new(); diff --git a/crate/cmd/src/scopes/multi_profile_no_flow.rs b/crate/cmd/src/scopes/multi_profile_no_flow.rs index c675d52f5..b5ac5dd35 100644 --- a/crate/cmd/src/scopes/multi_profile_no_flow.rs +++ b/crate/cmd/src/scopes/multi_profile_no_flow.rs @@ -3,7 +3,7 @@ use std::{collections::BTreeMap, fmt::Debug, hash::Hash}; use interruptible::InterruptibilityState; use own::{OwnedOrMutRef, OwnedOrRef}; use peace_core::Profile; -use peace_resources_rt::paths::{ +use peace_resource_rt::paths::{ PeaceAppDir, PeaceDir, ProfileDir, ProfileHistoryDir, WorkspaceDir, }; use peace_rt_model::{ diff --git a/crate/cmd/src/scopes/multi_profile_single_flow.rs b/crate/cmd/src/scopes/multi_profile_single_flow.rs index 85ebe2538..4b4e63c9c 100644 --- a/crate/cmd/src/scopes/multi_profile_single_flow.rs +++ b/crate/cmd/src/scopes/multi_profile_single_flow.rs @@ -4,7 +4,7 @@ use interruptible::InterruptibilityState; use own::{OwnedOrMutRef, OwnedOrRef}; use peace_core::Profile; use peace_params::ParamsSpecs; -use peace_resources_rt::{ +use peace_resource_rt::{ paths::{FlowDir, PeaceAppDir, PeaceDir, ProfileDir, ProfileHistoryDir, WorkspaceDir}, resources::ts::SetUp, states::StatesCurrentStored, @@ -131,7 +131,7 @@ where /// This is used to deserialize [`ParamsSpecsFile`]. /// /// [`Params`]: peace_cfg::Item::Params - /// [`ParamsSpecsFile`]: peace_resources_rt::paths::ParamsSpecsFile + /// [`ParamsSpecsFile`]: peace_resource_rt::paths::ParamsSpecsFile params_specs_type_reg: ParamsSpecsTypeReg, /// Item params specs for each profile for the selected flow. profile_to_params_specs: BTreeMap>, @@ -140,8 +140,8 @@ where /// This is used to deserialize [`StatesCurrentFile`] and /// [`StatesGoalFile`]. /// - /// [`StatesCurrentFile`]: peace_resources_rt::paths::StatesCurrentFile - /// [`StatesGoalFile`]: peace_resources_rt::paths::StatesGoalFile + /// [`StatesCurrentFile`]: peace_resource_rt::paths::StatesCurrentFile + /// [`StatesGoalFile`]: peace_resource_rt::paths::StatesGoalFile states_type_reg: StatesTypeReg, /// `Resources` for flow execution. resources: Resources, @@ -207,7 +207,7 @@ where /// This is used to deserialize [`ParamsSpecsFile`]. /// /// [`Params`]: peace_cfg::Item::Params - /// [`ParamsSpecsFile`]: peace_resources_rt::paths::ParamsSpecsFile + /// [`ParamsSpecsFile`]: peace_resource_rt::paths::ParamsSpecsFile pub params_specs_type_reg: &'view ParamsSpecsTypeReg, /// Item params specs for each profile for the selected flow. pub profile_to_params_specs: &'view BTreeMap>, @@ -216,8 +216,8 @@ where /// This is used to deserialize [`StatesCurrentFile`] and /// [`StatesGoalFile`]. /// - /// [`StatesCurrentFile`]: peace_resources_rt::paths::StatesCurrentFile - /// [`StatesGoalFile`]: peace_resources_rt::paths::StatesGoalFile + /// [`StatesCurrentFile`]: peace_resource_rt::paths::StatesCurrentFile + /// [`StatesGoalFile`]: peace_resource_rt::paths::StatesGoalFile pub states_type_reg: &'view StatesTypeReg, /// `Resources` for flow execution. pub resources: &'view mut Resources, @@ -423,7 +423,7 @@ where /// This is used to deserialize [`ParamsSpecsFile`]. /// /// [`Params`]: peace_cfg::Item::Params - /// [`ParamsSpecsFile`]: peace_resources_rt::paths::ParamsSpecsFile + /// [`ParamsSpecsFile`]: peace_resource_rt::paths::ParamsSpecsFile pub fn params_specs_type_reg(&self) -> &ParamsSpecsTypeReg { &self.params_specs_type_reg } @@ -439,8 +439,8 @@ where /// This is used to deserialize [`StatesCurrentFile`] and /// [`StatesGoalFile`]. /// - /// [`StatesCurrentFile`]: peace_resources_rt::paths::StatesCurrentFile - /// [`StatesGoalFile`]: peace_resources_rt::paths::StatesGoalFile + /// [`StatesCurrentFile`]: peace_resource_rt::paths::StatesCurrentFile + /// [`StatesGoalFile`]: peace_resource_rt::paths::StatesGoalFile pub fn states_type_reg(&self) -> &StatesTypeReg { &self.states_type_reg } diff --git a/crate/cmd/src/scopes/no_profile_no_flow.rs b/crate/cmd/src/scopes/no_profile_no_flow.rs index 243d1f2db..567e77915 100644 --- a/crate/cmd/src/scopes/no_profile_no_flow.rs +++ b/crate/cmd/src/scopes/no_profile_no_flow.rs @@ -2,7 +2,7 @@ use std::{fmt::Debug, hash::Hash}; use interruptible::InterruptibilityState; use own::{OwnedOrMutRef, OwnedOrRef}; -use peace_resources_rt::paths::{PeaceAppDir, PeaceDir, WorkspaceDir}; +use peace_resource_rt::paths::{PeaceAppDir, PeaceDir, WorkspaceDir}; use peace_rt_model::{ params::{KeyKnown, KeyMaybe, ParamsKeys, ParamsKeysImpl, ParamsTypeRegs, WorkspaceParams}, Workspace, diff --git a/crate/cmd/src/scopes/single_profile_no_flow.rs b/crate/cmd/src/scopes/single_profile_no_flow.rs index 8d7ff22b0..9a62293cd 100644 --- a/crate/cmd/src/scopes/single_profile_no_flow.rs +++ b/crate/cmd/src/scopes/single_profile_no_flow.rs @@ -3,7 +3,7 @@ use std::{fmt::Debug, hash::Hash}; use interruptible::InterruptibilityState; use own::{OwnedOrMutRef, OwnedOrRef}; use peace_core::Profile; -use peace_resources_rt::paths::{ +use peace_resource_rt::paths::{ PeaceAppDir, PeaceDir, ProfileDir, ProfileHistoryDir, WorkspaceDir, }; use peace_rt_model::{ diff --git a/crate/cmd/src/scopes/single_profile_single_flow.rs b/crate/cmd/src/scopes/single_profile_single_flow.rs index d10b7a0aa..fdbab3e75 100644 --- a/crate/cmd/src/scopes/single_profile_single_flow.rs +++ b/crate/cmd/src/scopes/single_profile_single_flow.rs @@ -4,7 +4,7 @@ use interruptible::InterruptibilityState; use own::{OwnedOrMutRef, OwnedOrRef}; use peace_core::Profile; use peace_params::ParamsSpecs; -use peace_resources_rt::{ +use peace_resource_rt::{ paths::{FlowDir, PeaceAppDir, PeaceDir, ProfileDir, ProfileHistoryDir, WorkspaceDir}, resources::ts::SetUp, Resources, @@ -106,7 +106,7 @@ where /// This is used to deserialize [`ParamsSpecsFile`]. /// /// [`Params`]: peace_cfg::Item::Params - /// [`ParamsSpecsFile`]: peace_resources_rt::paths::ParamsSpecsFile + /// [`ParamsSpecsFile`]: peace_resource_rt::paths::ParamsSpecsFile params_specs_type_reg: ParamsSpecsTypeReg, /// Item params specs for the selected flow. params_specs: ParamsSpecs, @@ -115,8 +115,8 @@ where /// This is used to deserialize [`StatesCurrentFile`] and /// [`StatesGoalFile`]. /// - /// [`StatesCurrentFile`]: peace_resources_rt::paths::StatesCurrentFile - /// [`StatesGoalFile`]: peace_resources_rt::paths::StatesGoalFile + /// [`StatesCurrentFile`]: peace_resource_rt::paths::StatesCurrentFile + /// [`StatesGoalFile`]: peace_resource_rt::paths::StatesGoalFile states_type_reg: StatesTypeReg, /// `Resources` for flow execution. resources: Resources, @@ -199,7 +199,7 @@ where /// This is used to deserialize [`ParamsSpecsFile`]. /// /// [`Params`]: peace_cfg::Item::Params - /// [`ParamsSpecsFile`]: peace_resources_rt::paths::ParamsSpecsFile + /// [`ParamsSpecsFile`]: peace_resource_rt::paths::ParamsSpecsFile pub params_specs_type_reg: &'view ParamsSpecsTypeReg, /// Item params specs for the selected flow. pub params_specs: &'view ParamsSpecs, @@ -208,8 +208,8 @@ where /// This is used to deserialize [`StatesCurrentFile`] and /// [`StatesGoalFile`]. /// - /// [`StatesCurrentFile`]: peace_resources_rt::paths::StatesCurrentFile - /// [`StatesGoalFile`]: peace_resources_rt::paths::StatesGoalFile + /// [`StatesCurrentFile`]: peace_resource_rt::paths::StatesCurrentFile + /// [`StatesGoalFile`]: peace_resource_rt::paths::StatesGoalFile pub states_type_reg: &'view StatesTypeReg, /// `Resources` for flow execution. pub resources: &'view mut Resources, @@ -485,7 +485,7 @@ where /// This is used to deserialize [`ParamsSpecsFile`]. /// /// [`Params`]: peace_cfg::Item::Params - /// [`ParamsSpecsFile`]: peace_resources_rt::paths::ParamsSpecsFile + /// [`ParamsSpecsFile`]: peace_resource_rt::paths::ParamsSpecsFile pub fn params_specs_type_reg(&self) -> &ParamsSpecsTypeReg { &self.params_specs_type_reg } @@ -500,8 +500,8 @@ where /// This is used to deserialize [`StatesCurrentFile`] and /// [`StatesGoalFile`]. /// - /// [`StatesCurrentFile`]: peace_resources_rt::paths::StatesCurrentFile - /// [`StatesGoalFile`]: peace_resources_rt::paths::StatesGoalFile + /// [`StatesCurrentFile`]: peace_resource_rt::paths::StatesCurrentFile + /// [`StatesGoalFile`]: peace_resource_rt::paths::StatesGoalFile pub fn states_type_reg(&self) -> &StatesTypeReg { &self.states_type_reg } diff --git a/crate/cmd_rt/Cargo.toml b/crate/cmd_rt/Cargo.toml index a7665aec3..2781f433c 100644 --- a/crate/cmd_rt/Cargo.toml +++ b/crate/cmd_rt/Cargo.toml @@ -30,7 +30,7 @@ miette = { workspace = true, optional = true } peace_cfg = { workspace = true } peace_cmd_model = { workspace = true } peace_cmd = { workspace = true } -peace_resources_rt = { workspace = true } +peace_resource_rt = { workspace = true } peace_rt_model = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true, features = ["sync"] } diff --git a/crate/cmd_rt/src/cmd_block.rs b/crate/cmd_rt/src/cmd_block.rs index ce074d55e..ef5640ca6 100644 --- a/crate/cmd_rt/src/cmd_block.rs +++ b/crate/cmd_rt/src/cmd_block.rs @@ -3,7 +3,7 @@ use std::fmt::Debug; use async_trait::async_trait; use peace_cmd::{ctx::CmdCtxTypesConstrained, scopes::SingleProfileSingleFlowView}; use peace_cmd_model::CmdBlockOutcome; -use peace_resources_rt::{resources::ts::SetUp, Resource, ResourceFetchError, Resources}; +use peace_resource_rt::{resources::ts::SetUp, Resource, ResourceFetchError, Resources}; cfg_if::cfg_if! { if #[cfg(feature = "output_progress")] { diff --git a/crate/cmd_rt/src/cmd_block/cmd_block_error.rs b/crate/cmd_rt/src/cmd_block/cmd_block_error.rs index 37bf43d71..dc4300a6f 100644 --- a/crate/cmd_rt/src/cmd_block/cmd_block_error.rs +++ b/crate/cmd_rt/src/cmd_block/cmd_block_error.rs @@ -3,7 +3,7 @@ use std::fmt::Debug; use fn_graph::StreamOutcome; use indexmap::IndexMap; use peace_cfg::ItemId; -use peace_resources_rt::ResourceFetchError; +use peace_resource_rt::ResourceFetchError; /// Error while executing a `CmdBlock`. /// diff --git a/crate/cmd_rt/src/cmd_block/cmd_block_wrapper.rs b/crate/cmd_rt/src/cmd_block/cmd_block_wrapper.rs index 5c2639f05..1d059dccb 100644 --- a/crate/cmd_rt/src/cmd_block/cmd_block_wrapper.rs +++ b/crate/cmd_rt/src/cmd_block/cmd_block_wrapper.rs @@ -4,7 +4,7 @@ use async_trait::async_trait; use fn_graph::StreamOutcomeState; use peace_cmd::{ctx::CmdCtxTypesConstrained, scopes::SingleProfileSingleFlowView}; use peace_cmd_model::{CmdBlockDesc, CmdBlockOutcome}; -use peace_resources_rt::Resource; +use peace_resource_rt::Resource; use tynm::TypeParamsFmtOpts; diff --git a/crate/cmd_rt/src/cmd_execution.rs b/crate/cmd_rt/src/cmd_execution.rs index 38c8f3e86..db5865b87 100644 --- a/crate/cmd_rt/src/cmd_execution.rs +++ b/crate/cmd_rt/src/cmd_execution.rs @@ -9,7 +9,7 @@ use peace_cmd::{ }, }; use peace_cmd_model::{CmdBlockDesc, CmdOutcome}; -use peace_resources_rt::{resources::ts::SetUp, Resources}; +use peace_resource_rt::{resources::ts::SetUp, Resources}; use crate::{CmdBlockError, CmdBlockRtBox, ItemStreamOutcomeMapper}; diff --git a/crate/cmd_rt/src/cmd_execution/cmd_execution_builder.rs b/crate/cmd_rt/src/cmd_execution/cmd_execution_builder.rs index 4c8f5d4dc..50d7111a2 100644 --- a/crate/cmd_rt/src/cmd_execution/cmd_execution_builder.rs +++ b/crate/cmd_rt/src/cmd_execution/cmd_execution_builder.rs @@ -1,7 +1,7 @@ use std::{collections::VecDeque, fmt::Debug}; use peace_cmd::ctx::CmdCtxTypesConstrained; -use peace_resources_rt::{resources::ts::SetUp, Resource, Resources}; +use peace_resource_rt::{resources::ts::SetUp, Resource, Resources}; use crate::{CmdBlock, CmdBlockRtBox, CmdBlockWrapper, CmdExecution}; diff --git a/crate/cmd_rt/src/cmd_execution/cmd_execution_error_builder.rs b/crate/cmd_rt/src/cmd_execution/cmd_execution_error_builder.rs index 9e3d3f5c3..6a15e7c28 100644 --- a/crate/cmd_rt/src/cmd_execution/cmd_execution_error_builder.rs +++ b/crate/cmd_rt/src/cmd_execution/cmd_execution_error_builder.rs @@ -2,7 +2,7 @@ use std::fmt::Debug; use peace_cmd::ctx::CmdCtxTypesConstrained; use peace_cmd_model::{CmdBlockDesc, CmdExecutionError}; -use peace_resources_rt::ResourceFetchError; +use peace_resource_rt::ResourceFetchError; use crate::CmdBlockRtBox; diff --git a/crate/code_gen/src/cmd/impl_build.rs b/crate/code_gen/src/cmd/impl_build.rs index 3fd3341c2..4be3a749b 100644 --- a/crate/code_gen/src/cmd/impl_build.rs +++ b/crate/code_gen/src/cmd/impl_build.rs @@ -353,17 +353,17 @@ fn impl_build_for( // .fold(( // std::collections::BTreeMap::< // peace_core::Profile, - // peace_resources_rt::paths::ProfileDir + // peace_resource_rt::paths::ProfileDir // >::new(), // std::collections::BTreeMap::< // peace_core::Profile, - // peace_resources_rt::paths::ProfileHistoryDir + // peace_resource_rt::paths::ProfileHistoryDir // >::new() // ), |(mut profile_dirs, mut profile_history_dirs), profile| { - // let profile_dir = peace_resources_rt::paths::ProfileDir::from( + // let profile_dir = peace_resource_rt::paths::ProfileDir::from( // (workspace_dirs.peace_app_dir(), profile) // ); - // let profile_history_dir = peace_resources_rt::paths::ProfileHistoryDir::from(&profile_dir); + // let profile_history_dir = peace_resource_rt::paths::ProfileHistoryDir::from(&profile_dir); // // profile_dirs.insert(profile.clone(), profile_dir); // profile_history_dirs.insert(profile.clone(), profile_history_dir); @@ -380,10 +380,10 @@ fn impl_build_for( // .iter() // .fold(std::collections::BTreeMap::< // peace_core::Profile, - // peace_resources_rt::paths::ProfileDir + // peace_resource_rt::paths::ProfileDir // >::new( // ), |mut flow_dirs, (profile, profile_dir)| { - // let flow_dir = peace_resources_rt::paths::FlowDir::from(( + // let flow_dir = peace_resource_rt::paths::FlowDir::from(( // profile_dir, // self.scope_builder.flow_selection.0.flow_id() // )); @@ -427,7 +427,7 @@ fn impl_build_for( // ) // .and_then(|(profile, profile_dir)| async move { // let profile_params_file = - // peace_resources_rt::internal::ProfileParamsFile::from(profile_dir); + // peace_resource_rt::internal::ProfileParamsFile::from(profile_dir); // // let profile_params = self // .#params_deserialize_method_name(&profile_params_file) @@ -462,7 +462,7 @@ fn impl_build_for( // ) // .and_then(|(profile, flow_dir)| async move { // let flow_params_file = - // peace_resources_rt::internal::FlowParamsFile::from(flow_dir); + // peace_resource_rt::internal::FlowParamsFile::from(flow_dir); // // let flow_params = self // .#params_deserialize_method_name(&flow_params_file) @@ -550,7 +550,7 @@ fn impl_build_for( #flow_params_serialize // Track items in memory. - let mut resources = peace_resources_rt::Resources::new(); + let mut resources = peace_resource_rt::Resources::new(); // === WorkspaceParamsSelected === // // crate::ctx::cmd_ctx_builder::workspace_params_insert(workspace_params, &mut resources); // resources.insert(workspace_params_file); @@ -615,7 +615,7 @@ fn impl_build_for( // let params_specs_provided = params_specs_provided.clone(); // async move { // let params_specs_file = - // peace_resources_rt::paths::ParamsSpecsFile::from(flow_dir); + // peace_resource_rt::paths::ParamsSpecsFile::from(flow_dir); // // let params_specs_stored = peace_rt_model::ParamsSpecsSerializer::< // peace_rt_model::Error @@ -659,7 +659,7 @@ fn impl_build_for( // .map(Result::<_, peace_rt_model::Error>::Ok) // ) // .and_then(|(profile, flow_dir)| async move { - // let states_current_file = peace_resources_rt::paths::StatesCurrentFile::from(flow_dir); + // let states_current_file = peace_resource_rt::paths::StatesCurrentFile::from(flow_dir); // // let states_current_stored = peace_rt_model::StatesSerializer::< // peace_rt_model::Error @@ -670,14 +670,14 @@ fn impl_build_for( // &states_current_file, // ) // .await? - // .map(Into::::into); + // .map(Into::::into); // // Ok((profile.clone(), states_current_stored)) // }) // .try_collect::< // std::collections::BTreeMap< // peace_core::Profile, - // Option + // Option // > // >() // .await?; @@ -699,7 +699,7 @@ fn impl_build_for( // // // Params specs loading and storage. // let params_specs_type_reg_ref = ¶ms_specs_type_reg; - // let params_specs_file = peace_resources_rt::paths::ParamsSpecsFile::from(&flow_dir); + // let params_specs_file = peace_resource_rt::paths::ParamsSpecsFile::from(&flow_dir); // let params_specs_stored = peace_rt_model::ParamsSpecsSerializer::< // peace_rt_model::Error // >::deserialize_opt( @@ -726,7 +726,7 @@ fn impl_build_for( // // // States loading and storage. // let states_type_reg_ref = &states_type_reg; - // let states_current_file = peace_resources_rt::paths::StatesCurrentFile::from(&flow_dir); + // let states_current_file = peace_resource_rt::paths::StatesCurrentFile::from(&flow_dir); // let states_current_stored = peace_rt_model::StatesSerializer::< // peace_rt_model::Error // >::deserialize_stored_opt( @@ -736,7 +736,7 @@ fn impl_build_for( // &states_current_file, // ) // .await? - // .map(Into::::into); + // .map(Into::::into); // if let Some(states_current_stored) = states_current_stored { // resources.insert(states_current_stored); // } @@ -977,7 +977,7 @@ fn workspace_params_load_save( let params_type_regs_builder = &self.scope_builder.params_type_regs_builder; let workspace_params = &mut self.scope_builder.workspace_params_selection.0; - let workspace_params_file = peace_resources_rt::internal::WorkspaceParamsFile::from( + let workspace_params_file = peace_resource_rt::internal::WorkspaceParamsFile::from( workspace_dirs.peace_app_dir() ); @@ -1053,7 +1053,7 @@ fn profile_params_load_save( let params_type_regs_builder = &self.scope_builder.params_type_regs_builder; let profile_params = &mut self.scope_builder.profile_params_selection.0; - let profile_params_file = peace_resources_rt::internal::ProfileParamsFile::from( + let profile_params_file = peace_resource_rt::internal::ProfileParamsFile::from( &profile_dir ); @@ -1113,7 +1113,7 @@ fn profile_params_load_save( ) .and_then(|(profile, profile_dir)| async move { let profile_params_file = - peace_resources_rt::internal::ProfileParamsFile::from(profile_dir); + peace_resource_rt::internal::ProfileParamsFile::from(profile_dir); let profile_params = Self::#params_deserialize_method_name( storage, @@ -1197,7 +1197,7 @@ fn flow_params_load_save( let params_type_regs_builder = &self.scope_builder.params_type_regs_builder; let flow_params = &mut self.scope_builder.flow_params_selection.0; - let flow_params_file = peace_resources_rt::internal::FlowParamsFile::from( + let flow_params_file = peace_resource_rt::internal::FlowParamsFile::from( &flow_dir ); @@ -1256,7 +1256,7 @@ fn flow_params_load_save( ) .and_then(|(profile, flow_dir)| async move { let flow_params_file = - peace_resources_rt::internal::FlowParamsFile::from(flow_dir); + peace_resource_rt::internal::FlowParamsFile::from(flow_dir); let flow_params = Self::#params_deserialize_method_name( storage, @@ -1391,8 +1391,8 @@ fn cmd_dirs(scope: Scope) -> proc_macro2::TokenStream { ProfileCount::None => {} ProfileCount::One => { dirs_tokens.extend(quote! { - let profile_dir = peace_resources_rt::paths::ProfileDir::from((workspace_dirs.peace_app_dir(), profile_s_ref)); - let profile_history_dir = peace_resources_rt::paths::ProfileHistoryDir::from(&profile_dir); + let profile_dir = peace_resource_rt::paths::ProfileDir::from((workspace_dirs.peace_app_dir(), profile_s_ref)); + let profile_history_dir = peace_resource_rt::paths::ProfileHistoryDir::from(&profile_dir); }); } ProfileCount::Multiple => { @@ -1402,17 +1402,17 @@ fn cmd_dirs(scope: Scope) -> proc_macro2::TokenStream { .fold(( std::collections::BTreeMap::< peace_core::Profile, - peace_resources_rt::paths::ProfileDir + peace_resource_rt::paths::ProfileDir >::new(), std::collections::BTreeMap::< peace_core::Profile, - peace_resources_rt::paths::ProfileHistoryDir + peace_resource_rt::paths::ProfileHistoryDir >::new() ), |(mut profile_dirs, mut profile_history_dirs), profile| { - let profile_dir = peace_resources_rt::paths::ProfileDir::from( + let profile_dir = peace_resource_rt::paths::ProfileDir::from( (workspace_dirs.peace_app_dir(), profile) ); - let profile_history_dir = peace_resources_rt::paths::ProfileHistoryDir::from(&profile_dir); + let profile_history_dir = peace_resource_rt::paths::ProfileHistoryDir::from(&profile_dir); profile_dirs.insert(profile.clone(), profile_dir); profile_history_dirs.insert(profile.clone(), profile_history_dir); @@ -1428,7 +1428,7 @@ fn cmd_dirs(scope: Scope) -> proc_macro2::TokenStream { ProfileCount::None => {} ProfileCount::One => { dirs_tokens.extend(quote! { - let flow_dir = peace_resources_rt::paths::FlowDir::from(( + let flow_dir = peace_resource_rt::paths::FlowDir::from(( &profile_dir, self.scope_builder.flow_selection.0.flow_id() )); @@ -1440,10 +1440,10 @@ fn cmd_dirs(scope: Scope) -> proc_macro2::TokenStream { .iter() .fold(std::collections::BTreeMap::< peace_core::Profile, - peace_resources_rt::paths::FlowDir + peace_resource_rt::paths::FlowDir >::new( ), |mut flow_dirs, (profile, profile_dir)| { - let flow_dir = peace_resources_rt::paths::FlowDir::from(( + let flow_dir = peace_resource_rt::paths::FlowDir::from(( profile_dir, self.scope_builder.flow_selection.0.flow_id() )); @@ -1622,7 +1622,7 @@ fn states_and_params_read_and_pg_init(scope: Scope) -> proc_macro2::TokenStream let params_specs_provided = params_specs_provided.clone(); async move { let params_specs_file = - peace_resources_rt::paths::ParamsSpecsFile::from(flow_dir); + peace_resource_rt::paths::ParamsSpecsFile::from(flow_dir); let params_specs_stored = peace_rt_model::ParamsSpecsSerializer::< peace_rt_model::Error @@ -1666,7 +1666,7 @@ fn states_and_params_read_and_pg_init(scope: Scope) -> proc_macro2::TokenStream .map(Result::<_, peace_rt_model::Error>::Ok) ) .and_then(|(profile, flow_dir)| async move { - let states_current_file = peace_resources_rt::paths::StatesCurrentFile::from(flow_dir); + let states_current_file = peace_resource_rt::paths::StatesCurrentFile::from(flow_dir); let states_current_stored = peace_rt_model::StatesSerializer::< peace_rt_model::Error @@ -1677,14 +1677,14 @@ fn states_and_params_read_and_pg_init(scope: Scope) -> proc_macro2::TokenStream &states_current_file, ) .await? - .map(Into::::into); + .map(Into::::into); Ok((profile.clone(), states_current_stored)) }) .try_collect::< std::collections::BTreeMap< peace_core::Profile, - Option + Option > >() .await?; @@ -1724,7 +1724,7 @@ fn states_and_params_read_and_pg_init(scope: Scope) -> proc_macro2::TokenStream // Params specs loading and storage. let params_specs_type_reg_ref = ¶ms_specs_type_reg; - let params_specs_file = peace_resources_rt::paths::ParamsSpecsFile::from(&flow_dir); + let params_specs_file = peace_resource_rt::paths::ParamsSpecsFile::from(&flow_dir); let params_specs_stored = peace_rt_model::ParamsSpecsSerializer::< peace_rt_model::Error >::deserialize_opt( @@ -1751,7 +1751,7 @@ fn states_and_params_read_and_pg_init(scope: Scope) -> proc_macro2::TokenStream // States loading and storage. let states_type_reg_ref = &states_type_reg; - let states_current_file = peace_resources_rt::paths::StatesCurrentFile::from(&flow_dir); + let states_current_file = peace_resource_rt::paths::StatesCurrentFile::from(&flow_dir); let states_current_stored = peace_rt_model::StatesSerializer::< peace_rt_model::Error >::deserialize_stored_opt( @@ -1761,7 +1761,7 @@ fn states_and_params_read_and_pg_init(scope: Scope) -> proc_macro2::TokenStream &states_current_file, ) .await? - .map(Into::::into); + .map(Into::::into); if let Some(states_current_stored) = states_current_stored { resources.insert(states_current_stored); } diff --git a/crate/code_gen/src/cmd/impl_params_deserialize.rs b/crate/code_gen/src/cmd/impl_params_deserialize.rs index f305e2ae6..25e0edfa6 100644 --- a/crate/code_gen/src/cmd/impl_params_deserialize.rs +++ b/crate/code_gen/src/cmd/impl_params_deserialize.rs @@ -100,8 +100,8 @@ fn impl_params_deserialize_for( #params_keys_impl_type_params >, >, - // workspace_params_file: &peace_resources_rt::internal::WorkspaceParamsFile, - #params_file_name: &peace_resources_rt::internal::#params_file_type, + // workspace_params_file: &peace_resource_rt::internal::WorkspaceParamsFile, + #params_file_name: &peace_resource_rt::internal::#params_file_type, // ) -> Result, peace_rt_model::Error> { ) -> Result>, peace_rt_model::Error> { let params_deserialized = peace_rt_model::WorkspaceInitializer::#params_deserialize_method_name::< diff --git a/crate/code_gen/src/cmd/impl_params_merge.rs b/crate/code_gen/src/cmd/impl_params_merge.rs index e542586b0..cab70a5d5 100644 --- a/crate/code_gen/src/cmd/impl_params_merge.rs +++ b/crate/code_gen/src/cmd/impl_params_merge.rs @@ -118,8 +118,8 @@ fn impl_params_merge_for( &peace_rt_model::params::ParamsTypeRegsBuilder<#params_keys_type>, // params: &mut peace_rt_model::params::WorkspaceParams, params: &mut peace_rt_model::params::#params_map_type<#params_k_type_param>, - // workspace_params_file: &peace_resources_rt::internal::WorkspaceParamsFile, - #params_file_name: &peace_resources_rt::internal::#params_file_type, + // workspace_params_file: &peace_resource_rt::internal::WorkspaceParamsFile, + #params_file_name: &peace_resource_rt::internal::#params_file_type, ) -> Result<(), peace_rt_model::Error> { let params_deserialized = peace_rt_model::WorkspaceInitializer::#params_deserialize_method_name::< // WorkspaceParamsK, diff --git a/crate/core/src/lib.rs b/crate/core/src/lib.rs index 4580eed18..b0cc82688 100644 --- a/crate/core/src/lib.rs +++ b/crate/core/src/lib.rs @@ -2,9 +2,9 @@ //! //! This crate exists because: //! -//! * `peace_cfg` has a dependency on `peace_resources_rt` for `Resources`, used +//! * `peace_cfg` has a dependency on `peace_resource_rt` for `Resources`, used //! in `Item::setup`. -//! * `peace_resources_rt` has a dependency on `ItemId`, as uses +//! * `peace_resource_rt` has a dependency on `ItemId`, as uses //! `TypeMap` for the `States` maps. //! //! When [peace#67] is implemented, the `progress` module can be moved out diff --git a/crate/params/Cargo.toml b/crate/params/Cargo.toml index 269cd399f..cfd1bf91d 100644 --- a/crate/params/Cargo.toml +++ b/crate/params/Cargo.toml @@ -27,7 +27,7 @@ miette = { workspace = true, optional = true } peace_core = { workspace = true } peace_data = { workspace = true } peace_params_derive = { workspace = true } -peace_resources_rt = { workspace = true } +peace_resource_rt = { workspace = true } serde = { workspace = true, features = ["derive"] } thiserror = { workspace = true } tynm = { workspace = true } diff --git a/crate/params/src/any_spec_data_type.rs b/crate/params/src/any_spec_data_type.rs index 62cbb6b30..f30b50899 100644 --- a/crate/params/src/any_spec_data_type.rs +++ b/crate/params/src/any_spec_data_type.rs @@ -3,7 +3,7 @@ use std::{any::Any, fmt}; use dyn_clone::DynClone; -use peace_resources_rt::type_reg::untagged::DataType; +use peace_resource_rt::type_reg::untagged::DataType; use crate::AnySpecRt; diff --git a/crate/params/src/any_spec_rt_boxed.rs b/crate/params/src/any_spec_rt_boxed.rs index 20b1b63e7..2a7c7b18b 100644 --- a/crate/params/src/any_spec_rt_boxed.rs +++ b/crate/params/src/any_spec_rt_boxed.rs @@ -1,6 +1,6 @@ use std::ops::{Deref, DerefMut}; -use peace_resources_rt::type_reg::{ +use peace_resource_rt::type_reg::{ untagged::{BoxDataTypeDowncast, DataType, DataTypeWrapper, FromDataType}, TypeNameLit, }; diff --git a/crate/params/src/field_wise_spec_rt.rs b/crate/params/src/field_wise_spec_rt.rs index 1ace4cf16..f32e051c0 100644 --- a/crate/params/src/field_wise_spec_rt.rs +++ b/crate/params/src/field_wise_spec_rt.rs @@ -1,6 +1,6 @@ use std::fmt::Debug; -use peace_resources_rt::{resources::ts::SetUp, Resources}; +use peace_resource_rt::{resources::ts::SetUp, Resources}; use serde::{de::DeserializeOwned, Serialize}; use crate::{AnySpecRt, ParamsResolveError, ValueResolutionCtx}; diff --git a/crate/params/src/mapping_fn.rs b/crate/params/src/mapping_fn.rs index 407a0c4d6..2abae1f55 100644 --- a/crate/params/src/mapping_fn.rs +++ b/crate/params/src/mapping_fn.rs @@ -1,6 +1,6 @@ use std::fmt::Debug; -use peace_resources_rt::{resources::ts::SetUp, type_reg::untagged::DataType, Resources}; +use peace_resource_rt::{resources::ts::SetUp, type_reg::untagged::DataType, Resources}; use serde::{Serialize, Serializer}; use crate::{ParamsResolveError, ValueResolutionCtx}; diff --git a/crate/params/src/mapping_fn_impl.rs b/crate/params/src/mapping_fn_impl.rs index 5490d3fe5..b080cdc2a 100644 --- a/crate/params/src/mapping_fn_impl.rs +++ b/crate/params/src/mapping_fn_impl.rs @@ -4,7 +4,7 @@ use std::{ }; use peace_data::marker::{ApplyDry, Clean, Current, Goal}; -use peace_resources_rt::{resources::ts::SetUp, BorrowFail, Resources}; +use peace_resource_rt::{resources::ts::SetUp, BorrowFail, Resources}; use serde::{Deserialize, Serialize, Serializer}; use crate::{ diff --git a/crate/params/src/params_spec.rs b/crate/params/src/params_spec.rs index e6d7325ce..7f5db83dc 100644 --- a/crate/params/src/params_spec.rs +++ b/crate/params/src/params_spec.rs @@ -1,6 +1,6 @@ use std::fmt::{self, Debug}; -use peace_resources_rt::{resources::ts::SetUp, BorrowFail, Resources}; +use peace_resource_rt::{resources::ts::SetUp, BorrowFail, Resources}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use crate::{ @@ -139,7 +139,7 @@ where { pub fn resolve( &self, - resources: &Resources, + resources: &Resources, value_resolution_ctx: &mut ValueResolutionCtx, ) -> Result { match self { diff --git a/crate/params/src/params_spec_fieldless.rs b/crate/params/src/params_spec_fieldless.rs index 68371e6b0..7fd7de43a 100644 --- a/crate/params/src/params_spec_fieldless.rs +++ b/crate/params/src/params_spec_fieldless.rs @@ -1,6 +1,6 @@ use std::fmt::{self, Debug}; -use peace_resources_rt::{resources::ts::SetUp, BorrowFail, Resources}; +use peace_resource_rt::{resources::ts::SetUp, BorrowFail, Resources}; use serde::{Deserialize, Serialize}; use crate::{ @@ -117,7 +117,7 @@ where { pub fn resolve( &self, - resources: &Resources, + resources: &Resources, value_resolution_ctx: &mut ValueResolutionCtx, ) -> Result { match self { diff --git a/crate/params/src/params_specs.rs b/crate/params/src/params_specs.rs index 7f4517f30..0d9d5052d 100644 --- a/crate/params/src/params_specs.rs +++ b/crate/params/src/params_specs.rs @@ -1,7 +1,7 @@ use std::ops::{Deref, DerefMut}; use peace_core::ItemId; -use peace_resources_rt::type_reg::untagged::TypeMap; +use peace_resource_rt::type_reg::untagged::TypeMap; use serde::Serialize; use crate::AnySpecRtBoxed; diff --git a/crate/params/src/value_spec.rs b/crate/params/src/value_spec.rs index 535dc8e68..ee2854d13 100644 --- a/crate/params/src/value_spec.rs +++ b/crate/params/src/value_spec.rs @@ -1,6 +1,6 @@ use std::fmt::{self, Debug}; -use peace_resources_rt::{resources::ts::SetUp, BorrowFail, Resources}; +use peace_resource_rt::{resources::ts::SetUp, BorrowFail, Resources}; use serde::{Deserialize, Serialize}; use crate::{ @@ -115,7 +115,7 @@ where { pub fn resolve( &self, - resources: &Resources, + resources: &Resources, value_resolution_ctx: &mut ValueResolutionCtx, ) -> Result { match self { diff --git a/crate/params/src/value_spec_rt.rs b/crate/params/src/value_spec_rt.rs index 8ab025a66..5317bc983 100644 --- a/crate/params/src/value_spec_rt.rs +++ b/crate/params/src/value_spec_rt.rs @@ -1,6 +1,6 @@ use std::fmt::Debug; -use peace_resources_rt::{resources::ts::SetUp, Resources}; +use peace_resource_rt::{resources::ts::SetUp, Resources}; use crate::{AnySpecRt, ParamsResolveError, ValueResolutionCtx}; diff --git a/crate/params_derive/src/impl_field_wise_spec_rt_for_field_wise.rs b/crate/params_derive/src/impl_field_wise_spec_rt_for_field_wise.rs index e108f2694..de3ab9bfe 100644 --- a/crate/params_derive/src/impl_field_wise_spec_rt_for_field_wise.rs +++ b/crate/params_derive/src/impl_field_wise_spec_rt_for_field_wise.rs @@ -12,7 +12,7 @@ pub fn impl_field_wise_spec_rt_for_field_wise( ast: &DeriveInput, generics_split: &(ImplGenerics, TypeGenerics, Option<&WhereClause>), peace_params_path: &Path, - peace_resources_rt_path: &Path, + peace_resource_rt_path: &Path, params_name: &Ident, params_field_wise_name: &Ident, params_partial_name: &Ident, @@ -101,7 +101,7 @@ pub fn impl_field_wise_spec_rt_for_field_wise( fn resolve( &self, - resources: &#peace_resources_rt_path::Resources<#peace_resources_rt_path::resources::ts::SetUp>, + resources: &#peace_resource_rt_path::Resources<#peace_resource_rt_path::resources::ts::SetUp>, value_resolution_ctx: &mut #peace_params_path::ValueResolutionCtx, ) -> Result<#params_name #ty_generics, #peace_params_path::ParamsResolveError> { #resolve_body @@ -109,7 +109,7 @@ pub fn impl_field_wise_spec_rt_for_field_wise( fn resolve_partial( &self, - resources: &#peace_resources_rt_path::Resources<#peace_resources_rt_path::resources::ts::SetUp>, + resources: &#peace_resource_rt_path::Resources<#peace_resource_rt_path::resources::ts::SetUp>, value_resolution_ctx: &mut #peace_params_path::ValueResolutionCtx, ) -> Result<#params_partial_name #ty_generics, #peace_params_path::ParamsResolveError> { #resolve_partial_body diff --git a/crate/params_derive/src/impl_field_wise_spec_rt_for_field_wise_external.rs b/crate/params_derive/src/impl_field_wise_spec_rt_for_field_wise_external.rs index 90e46c94f..d5b26c689 100644 --- a/crate/params_derive/src/impl_field_wise_spec_rt_for_field_wise_external.rs +++ b/crate/params_derive/src/impl_field_wise_spec_rt_for_field_wise_external.rs @@ -5,7 +5,7 @@ use syn::{Ident, ImplGenerics, Path, TypeGenerics, WhereClause}; pub fn impl_field_wise_spec_rt_for_field_wise_external( generics_split: &(ImplGenerics, TypeGenerics, Option<&WhereClause>), peace_params_path: &Path, - peace_resources_rt_path: &Path, + peace_resource_rt_path: &Path, params_name: &Ident, params_field_wise_name: &Ident, params_partial_name: &Ident, @@ -22,7 +22,7 @@ pub fn impl_field_wise_spec_rt_for_field_wise_external( fn resolve( &self, - resources: &#peace_resources_rt_path::Resources<#peace_resources_rt_path::resources::ts::SetUp>, + resources: &#peace_resource_rt_path::Resources<#peace_resource_rt_path::resources::ts::SetUp>, value_resolution_ctx: &mut #peace_params_path::ValueResolutionCtx, ) -> Result<#params_name #ty_generics, #peace_params_path::ParamsResolveError> { if let Some(params) = self.0.as_ref() { @@ -31,13 +31,13 @@ pub fn impl_field_wise_spec_rt_for_field_wise_external( match resources.try_borrow::<#params_name #ty_generics>() { Ok(t) => Ok((&*t).clone()), Err(borrow_fail) => match borrow_fail { - #peace_resources_rt_path::BorrowFail::ValueNotFound => { + #peace_resource_rt_path::BorrowFail::ValueNotFound => { Err(#peace_params_path::ParamsResolveError::InMemory { value_resolution_ctx: value_resolution_ctx.clone(), }) } - #peace_resources_rt_path::BorrowFail::BorrowConflictImm | - #peace_resources_rt_path::BorrowFail::BorrowConflictMut => { + #peace_resource_rt_path::BorrowFail::BorrowConflictImm | + #peace_resource_rt_path::BorrowFail::BorrowConflictMut => { Err(#peace_params_path::ParamsResolveError::InMemoryBorrowConflict { value_resolution_ctx: value_resolution_ctx.clone(), }) @@ -49,7 +49,7 @@ pub fn impl_field_wise_spec_rt_for_field_wise_external( fn resolve_partial( &self, - resources: &#peace_resources_rt_path::Resources<#peace_resources_rt_path::resources::ts::SetUp>, + resources: &#peace_resource_rt_path::Resources<#peace_resource_rt_path::resources::ts::SetUp>, value_resolution_ctx: &mut #peace_params_path::ValueResolutionCtx, ) -> Result<#params_partial_name #ty_generics, #peace_params_path::ParamsResolveError> { if let Some(params) = self.0.as_ref() { @@ -58,13 +58,13 @@ pub fn impl_field_wise_spec_rt_for_field_wise_external( match resources.try_borrow::<#params_name #ty_generics>() { Ok(t) => Ok((&*t).clone().into()), Err(borrow_fail) => match borrow_fail { - #peace_resources_rt_path::BorrowFail::ValueNotFound => { + #peace_resource_rt_path::BorrowFail::ValueNotFound => { Err(#peace_params_path::ParamsResolveError::InMemory { value_resolution_ctx: value_resolution_ctx.clone(), }) } - #peace_resources_rt_path::BorrowFail::BorrowConflictImm | - #peace_resources_rt_path::BorrowFail::BorrowConflictMut => { + #peace_resource_rt_path::BorrowFail::BorrowConflictImm | + #peace_resource_rt_path::BorrowFail::BorrowConflictMut => { Err(#peace_params_path::ParamsResolveError::InMemoryBorrowConflict { value_resolution_ctx: value_resolution_ctx.clone(), }) diff --git a/crate/params_derive/src/impl_value_spec_rt_for_field_wise.rs b/crate/params_derive/src/impl_value_spec_rt_for_field_wise.rs index 4db38b45b..9d48c59cf 100644 --- a/crate/params_derive/src/impl_value_spec_rt_for_field_wise.rs +++ b/crate/params_derive/src/impl_value_spec_rt_for_field_wise.rs @@ -12,7 +12,7 @@ pub fn impl_value_spec_rt_for_field_wise( ast: &DeriveInput, generics_split: &(ImplGenerics, TypeGenerics, Option<&WhereClause>), peace_params_path: &Path, - peace_resources_rt_path: &Path, + peace_resource_rt_path: &Path, params_name: &Ident, params_field_wise_name: &Ident, ) -> proc_macro2::TokenStream { @@ -99,7 +99,7 @@ pub fn impl_value_spec_rt_for_field_wise( fn resolve( &self, - resources: &#peace_resources_rt_path::Resources<#peace_resources_rt_path::resources::ts::SetUp>, + resources: &#peace_resource_rt_path::Resources<#peace_resource_rt_path::resources::ts::SetUp>, value_resolution_ctx: &mut #peace_params_path::ValueResolutionCtx, ) -> Result<#params_name #ty_generics, #peace_params_path::ParamsResolveError> { #resolve_body @@ -107,7 +107,7 @@ pub fn impl_value_spec_rt_for_field_wise( fn try_resolve( &self, - resources: &#peace_resources_rt_path::Resources<#peace_resources_rt_path::resources::ts::SetUp>, + resources: &#peace_resource_rt_path::Resources<#peace_resource_rt_path::resources::ts::SetUp>, value_resolution_ctx: &mut #peace_params_path::ValueResolutionCtx, ) -> Result, #peace_params_path::ParamsResolveError> { #try_resolve_body diff --git a/crate/params_derive/src/lib.rs b/crate/params_derive/src/lib.rs index 1424e4a57..39aa7d4b1 100644 --- a/crate/params_derive/src/lib.rs +++ b/crate/params_derive/src/lib.rs @@ -141,14 +141,14 @@ pub fn value_impl(input: TokenStream) -> TokenStream { } fn impl_value(ast: &mut DeriveInput, impl_mode: ImplMode) -> proc_macro2::TokenStream { - let (peace_params_path, peace_resources_rt_path): (Path, Path) = ast + let (peace_params_path, peace_resource_rt_path): (Path, Path) = ast .attrs .iter() .find_map(|attr| { if attr.path().is_ident("peace_internal") { - Some((parse_quote!(peace_params), parse_quote!(peace_resources_rt))) + Some((parse_quote!(peace_params), parse_quote!(peace_resource_rt))) } else if attr.path().is_ident("crate_internal") { - Some((parse_quote!(crate), parse_quote!(peace_resources_rt))) + Some((parse_quote!(crate), parse_quote!(peace_resource_rt))) } else { None } @@ -237,7 +237,7 @@ fn impl_value(ast: &mut DeriveInput, impl_mode: ImplMode) -> proc_macro2::TokenS ast, &generics_split, &peace_params_path, - &peace_resources_rt_path, + &peace_resource_rt_path, &value_ty, value_name, &t_field_wise_name, @@ -251,7 +251,7 @@ fn impl_value(ast: &mut DeriveInput, impl_mode: ImplMode) -> proc_macro2::TokenS ast, &generics_split, &peace_params_path, - &peace_resources_rt_path, + &peace_resource_rt_path, value_name, &t_field_wise_name, &t_partial_name, @@ -440,7 +440,7 @@ fn t_field_wise( ast: &DeriveInput, generics_split: &(ImplGenerics, TypeGenerics, Option<&WhereClause>), peace_params_path: &Path, - peace_resources_rt_path: &Path, + peace_resource_rt_path: &Path, params_name: &Ident, t_field_wise_name: &Ident, t_partial_name: &Ident, @@ -465,7 +465,7 @@ fn t_field_wise( ast, generics_split, peace_params_path, - peace_resources_rt_path, + peace_resource_rt_path, params_name, t_field_wise_name, t_partial_name, @@ -475,7 +475,7 @@ fn t_field_wise( ast, generics_split, peace_params_path, - peace_resources_rt_path, + peace_resource_rt_path, params_name, t_field_wise_name, )); @@ -509,7 +509,7 @@ fn t_field_wise_external( ast: &DeriveInput, generics_split: &(ImplGenerics, TypeGenerics, Option<&WhereClause>), peace_params_path: &Path, - peace_resources_rt_path: &Path, + peace_resource_rt_path: &Path, params_ty: &Type, params_name: &Ident, t_field_wise_name: &Ident, @@ -531,7 +531,7 @@ fn t_field_wise_external( t_field_wise.extend(impl_field_wise_spec_rt_for_field_wise_external( generics_split, peace_params_path, - peace_resources_rt_path, + peace_resource_rt_path, params_name, t_field_wise_name, t_partial_name, diff --git a/crate/resources_rt/Cargo.toml b/crate/resources_rt/Cargo.toml index b4ee8485f..1b0dc8312 100644 --- a/crate/resources_rt/Cargo.toml +++ b/crate/resources_rt/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "peace_resources_rt" +name = "peace_resource_rt" description = "Runtime resources for the peace automation framework." -documentation = "https://docs.rs/peace_resources_rt/" +documentation = "https://docs.rs/peace_resource_rt/" authors.workspace = true version.workspace = true edition.workspace = true diff --git a/crate/rt/Cargo.toml b/crate/rt/Cargo.toml index 122061c93..01b6d97d3 100644 --- a/crate/rt/Cargo.toml +++ b/crate/rt/Cargo.toml @@ -31,7 +31,7 @@ peace_cmd_model = { workspace = true } peace_cmd = { workspace = true } peace_cmd_rt = { workspace = true } peace_params = { workspace = true } -peace_resources_rt = { workspace = true } +peace_resource_rt = { workspace = true } peace_rt_model = { workspace = true } peace_rt_model_core = { workspace = true } peace_value_traits = { workspace = true } diff --git a/crate/rt/src/cmd_blocks/apply_exec_cmd_block.rs b/crate/rt/src/cmd_blocks/apply_exec_cmd_block.rs index 9d480fff2..b7ed4daa7 100644 --- a/crate/rt/src/cmd_blocks/apply_exec_cmd_block.rs +++ b/crate/rt/src/cmd_blocks/apply_exec_cmd_block.rs @@ -7,7 +7,7 @@ use peace_cmd::{ctx::CmdCtxTypesConstrained, scopes::SingleProfileSingleFlowView use peace_cmd_model::CmdBlockOutcome; use peace_cmd_rt::{async_trait, CmdBlock}; use peace_params::ParamsSpecs; -use peace_resources_rt::{ +use peace_resource_rt::{ internal::StatesMut, resources::ts::SetUp, states::{ diff --git a/crate/rt/src/cmd_blocks/apply_state_sync_check_cmd_block.rs b/crate/rt/src/cmd_blocks/apply_state_sync_check_cmd_block.rs index 5abbc8798..1ea5fe396 100644 --- a/crate/rt/src/cmd_blocks/apply_state_sync_check_cmd_block.rs +++ b/crate/rt/src/cmd_blocks/apply_state_sync_check_cmd_block.rs @@ -3,7 +3,7 @@ use std::{fmt::Debug, marker::PhantomData}; use peace_cmd::{ctx::CmdCtxTypesConstrained, scopes::SingleProfileSingleFlowView}; use peace_cmd_model::CmdBlockOutcome; use peace_cmd_rt::{async_trait, CmdBlock}; -use peace_resources_rt::{ +use peace_resource_rt::{ resources::ts::SetUp, states::{States, StatesCurrent, StatesCurrentStored, StatesGoal, StatesGoalStored}, ResourceFetchError, Resources, diff --git a/crate/rt/src/cmd_blocks/diff_cmd_block.rs b/crate/rt/src/cmd_blocks/diff_cmd_block.rs index 144982370..3518fe615 100644 --- a/crate/rt/src/cmd_blocks/diff_cmd_block.rs +++ b/crate/rt/src/cmd_blocks/diff_cmd_block.rs @@ -10,7 +10,7 @@ use peace_cmd::{ use peace_cmd_model::CmdBlockOutcome; use peace_cmd_rt::{async_trait, CmdBlock}; use peace_params::ParamsSpecs; -use peace_resources_rt::{ +use peace_resource_rt::{ internal::StateDiffsMut, resources::ts::SetUp, states::{ diff --git a/crate/rt/src/cmd_blocks/states_clean_insertion_cmd_block.rs b/crate/rt/src/cmd_blocks/states_clean_insertion_cmd_block.rs index 9e7b0b64e..aba474f2b 100644 --- a/crate/rt/src/cmd_blocks/states_clean_insertion_cmd_block.rs +++ b/crate/rt/src/cmd_blocks/states_clean_insertion_cmd_block.rs @@ -4,7 +4,7 @@ use futures::FutureExt; use peace_cmd::{ctx::CmdCtxTypesConstrained, scopes::SingleProfileSingleFlowView}; use peace_cmd_model::CmdBlockOutcome; use peace_cmd_rt::{async_trait, CmdBlock}; -use peace_resources_rt::{ +use peace_resource_rt::{ internal::StatesMut, resources::ts::SetUp, states::{ts::Clean, StatesClean}, diff --git a/crate/rt/src/cmd_blocks/states_current_read_cmd_block.rs b/crate/rt/src/cmd_blocks/states_current_read_cmd_block.rs index 57653fc6f..038c30119 100644 --- a/crate/rt/src/cmd_blocks/states_current_read_cmd_block.rs +++ b/crate/rt/src/cmd_blocks/states_current_read_cmd_block.rs @@ -4,7 +4,7 @@ use peace_cfg::{FlowId, ItemId}; use peace_cmd::{ctx::CmdCtxTypesConstrained, scopes::SingleProfileSingleFlowView}; use peace_cmd_model::CmdBlockOutcome; use peace_cmd_rt::{async_trait, CmdBlock}; -use peace_resources_rt::{ +use peace_resource_rt::{ paths::{FlowDir, StatesCurrentFile}, resources::ts::SetUp, states::StatesCurrentStored, diff --git a/crate/rt/src/cmd_blocks/states_discover_cmd_block.rs b/crate/rt/src/cmd_blocks/states_discover_cmd_block.rs index e01a65ea6..25ff4c0b9 100644 --- a/crate/rt/src/cmd_blocks/states_discover_cmd_block.rs +++ b/crate/rt/src/cmd_blocks/states_discover_cmd_block.rs @@ -5,7 +5,7 @@ use peace_cfg::{FnCtx, ItemId}; use peace_cmd::{ctx::CmdCtxTypesConstrained, scopes::SingleProfileSingleFlowView}; use peace_cmd_model::CmdBlockOutcome; use peace_cmd_rt::{async_trait, CmdBlock}; -use peace_resources_rt::{ +use peace_resource_rt::{ internal::StatesMut, resources::ts::SetUp, states::{ diff --git a/crate/rt/src/cmd_blocks/states_goal_read_cmd_block.rs b/crate/rt/src/cmd_blocks/states_goal_read_cmd_block.rs index 46bae04eb..439ff095e 100644 --- a/crate/rt/src/cmd_blocks/states_goal_read_cmd_block.rs +++ b/crate/rt/src/cmd_blocks/states_goal_read_cmd_block.rs @@ -4,7 +4,7 @@ use peace_cfg::{FlowId, ItemId}; use peace_cmd::{ctx::CmdCtxTypesConstrained, scopes::SingleProfileSingleFlowView}; use peace_cmd_model::CmdBlockOutcome; use peace_cmd_rt::{async_trait, CmdBlock}; -use peace_resources_rt::{ +use peace_resource_rt::{ paths::{FlowDir, StatesGoalFile}, resources::ts::SetUp, states::StatesGoalStored, diff --git a/crate/rt/src/cmds/clean_cmd.rs b/crate/rt/src/cmds/clean_cmd.rs index c6d20dd64..2ecbd89f6 100644 --- a/crate/rt/src/cmds/clean_cmd.rs +++ b/crate/rt/src/cmds/clean_cmd.rs @@ -6,7 +6,7 @@ use peace_cmd::{ }; use peace_cmd_model::CmdOutcome; use peace_cmd_rt::{CmdBlockWrapper, CmdExecution}; -use peace_resources_rt::{ +use peace_resource_rt::{ paths::{FlowDir, StatesCurrentFile}, resources::ts::SetUp, states::{States, StatesCleaned, StatesCleanedDry, StatesPrevious}, diff --git a/crate/rt/src/cmds/diff_cmd.rs b/crate/rt/src/cmds/diff_cmd.rs index b5307f9ce..834fc1ef2 100644 --- a/crate/rt/src/cmds/diff_cmd.rs +++ b/crate/rt/src/cmds/diff_cmd.rs @@ -9,7 +9,7 @@ use peace_cmd::{ use peace_cmd_model::CmdOutcome; use peace_cmd_rt::{CmdBlockWrapper, CmdExecution, CmdExecutionBuilder}; use peace_params::ParamsSpecs; -use peace_resources_rt::{ +use peace_resource_rt::{ internal::StateDiffsMut, resources::ts::SetUp, states::{ diff --git a/crate/rt/src/cmds/ensure_cmd.rs b/crate/rt/src/cmds/ensure_cmd.rs index 2ffb25314..e3c6cb81e 100644 --- a/crate/rt/src/cmds/ensure_cmd.rs +++ b/crate/rt/src/cmds/ensure_cmd.rs @@ -6,7 +6,7 @@ use peace_cmd::{ }; use peace_cmd_model::CmdOutcome; use peace_cmd_rt::{CmdBlockWrapper, CmdExecution}; -use peace_resources_rt::{ +use peace_resource_rt::{ paths::{FlowDir, StatesCurrentFile, StatesGoalFile}, resources::ts::SetUp, states::{States, StatesEnsured, StatesEnsuredDry, StatesGoal, StatesPrevious}, diff --git a/crate/rt/src/cmds/states_current_read_cmd.rs b/crate/rt/src/cmds/states_current_read_cmd.rs index 2aca45648..abb2439e4 100644 --- a/crate/rt/src/cmds/states_current_read_cmd.rs +++ b/crate/rt/src/cmds/states_current_read_cmd.rs @@ -6,7 +6,7 @@ use peace_cmd::{ }; use peace_cmd_model::CmdOutcome; use peace_cmd_rt::{CmdBlockWrapper, CmdExecution}; -use peace_resources_rt::states::StatesCurrentStored; +use peace_resource_rt::states::StatesCurrentStored; use crate::cmd_blocks::StatesCurrentReadCmdBlock; diff --git a/crate/rt/src/cmds/states_current_stored_display_cmd.rs b/crate/rt/src/cmds/states_current_stored_display_cmd.rs index 90f86c5ee..1a9ea5477 100644 --- a/crate/rt/src/cmds/states_current_stored_display_cmd.rs +++ b/crate/rt/src/cmds/states_current_stored_display_cmd.rs @@ -5,7 +5,7 @@ use peace_cmd::{ scopes::SingleProfileSingleFlow, }; use peace_cmd_model::CmdOutcome; -use peace_resources_rt::states::StatesCurrentStored; +use peace_resource_rt::states::StatesCurrentStored; use peace_rt_model_core::output::OutputWrite; use crate::cmds::StatesCurrentReadCmd; diff --git a/crate/rt/src/cmds/states_discover_cmd.rs b/crate/rt/src/cmds/states_discover_cmd.rs index eb98528aa..bd75c5210 100644 --- a/crate/rt/src/cmds/states_discover_cmd.rs +++ b/crate/rt/src/cmds/states_discover_cmd.rs @@ -6,7 +6,7 @@ use peace_cmd::{ }; use peace_cmd_model::CmdOutcome; use peace_cmd_rt::{CmdBlockWrapper, CmdExecution}; -use peace_resources_rt::{ +use peace_resource_rt::{ paths::{FlowDir, StatesCurrentFile, StatesGoalFile}, resources::ts::SetUp, states::{StatesCurrent, StatesGoal}, diff --git a/crate/rt/src/cmds/states_goal_display_cmd.rs b/crate/rt/src/cmds/states_goal_display_cmd.rs index fa37a5c8d..e0d94e78a 100644 --- a/crate/rt/src/cmds/states_goal_display_cmd.rs +++ b/crate/rt/src/cmds/states_goal_display_cmd.rs @@ -5,7 +5,7 @@ use peace_cmd::{ scopes::SingleProfileSingleFlow, }; use peace_cmd_model::CmdOutcome; -use peace_resources_rt::states::StatesGoalStored; +use peace_resource_rt::states::StatesGoalStored; use peace_rt_model_core::output::OutputWrite; diff --git a/crate/rt/src/cmds/states_goal_read_cmd.rs b/crate/rt/src/cmds/states_goal_read_cmd.rs index d3a160bc6..498b19342 100644 --- a/crate/rt/src/cmds/states_goal_read_cmd.rs +++ b/crate/rt/src/cmds/states_goal_read_cmd.rs @@ -6,7 +6,7 @@ use peace_cmd::{ }; use peace_cmd_model::CmdOutcome; use peace_cmd_rt::{CmdBlockWrapper, CmdExecution}; -use peace_resources_rt::states::StatesGoalStored; +use peace_resource_rt::states::StatesGoalStored; use crate::cmd_blocks::StatesGoalReadCmdBlock; diff --git a/crate/rt_model/Cargo.toml b/crate/rt_model/Cargo.toml index 51caceadb..9a53d32bd 100644 --- a/crate/rt_model/Cargo.toml +++ b/crate/rt_model/Cargo.toml @@ -31,7 +31,7 @@ peace_data = { workspace = true } peace_flow_model = { workspace = true } peace_fmt = { workspace = true } peace_params = { workspace = true } -peace_resources_rt = { workspace = true } +peace_resource_rt = { workspace = true } peace_rt_model_core = { workspace = true } peace_rt_model_hack = { workspace = true, optional = true } serde = { workspace = true } diff --git a/crate/rt_model/src/item_graph.rs b/crate/rt_model/src/item_graph.rs index a075719ca..731af6d89 100644 --- a/crate/rt_model/src/item_graph.rs +++ b/crate/rt_model/src/item_graph.rs @@ -4,7 +4,7 @@ use std::{ }; use peace_data::fn_graph::FnGraph; -use peace_resources_rt::states::{States, StatesSerde}; +use peace_resource_rt::states::{States, StatesSerde}; use crate::ItemBoxed; diff --git a/crate/rt_model/src/item_rt.rs b/crate/rt_model/src/item_rt.rs index 789d060bf..9c1864966 100644 --- a/crate/rt_model/src/item_rt.rs +++ b/crate/rt_model/src/item_rt.rs @@ -4,7 +4,7 @@ use dyn_clone::DynClone; use peace_cfg::{async_trait, FnCtx, ItemId}; use peace_data::fn_graph::{DataAccess, DataAccessDyn}; use peace_params::ParamsSpecs; -use peace_resources_rt::{ +use peace_resource_rt::{ resources::ts::{Empty, SetUp}, states::StatesCurrent, type_reg::untagged::{BoxDtDisplay, TypeMap}, diff --git a/crate/rt_model/src/item_wrapper.rs b/crate/rt_model/src/item_wrapper.rs index b716a73a7..915ff249b 100644 --- a/crate/rt_model/src/item_wrapper.rs +++ b/crate/rt_model/src/item_wrapper.rs @@ -12,7 +12,7 @@ use peace_data::{ Data, }; use peace_params::{Params, ParamsSpec, ParamsSpecs, ValueResolutionCtx, ValueResolutionMode}; -use peace_resources_rt::{ +use peace_resource_rt::{ resources::ts::{Empty, SetUp}, states::StatesCurrent, type_reg::untagged::{BoxDtDisplay, TypeMap}, diff --git a/crate/rt_model/src/outcomes.rs b/crate/rt_model/src/outcomes.rs index f179e9527..e14665fd0 100644 --- a/crate/rt_model/src/outcomes.rs +++ b/crate/rt_model/src/outcomes.rs @@ -45,7 +45,7 @@ macro_rules! box_data_type_newtype { } } - impl peace_resources_rt::type_reg::untagged::BoxDataTypeDowncast for $ty_name + impl peace_resource_rt::type_reg::untagged::BoxDataTypeDowncast for $ty_name where T: $trait_path, { @@ -58,9 +58,9 @@ macro_rules! box_data_type_newtype { } } - impl peace_resources_rt::type_reg::untagged::DataTypeWrapper for $ty_name { - fn type_name(&self) -> peace_resources_rt::type_reg::TypeNameLit { - peace_resources_rt::type_reg::untagged::DataType::type_name(&*self.0) + impl peace_resource_rt::type_reg::untagged::DataTypeWrapper for $ty_name { + fn type_name(&self) -> peace_resource_rt::type_reg::TypeNameLit { + peace_resource_rt::type_reg::untagged::DataType::type_name(&*self.0) } fn clone(&self) -> Self { @@ -71,7 +71,7 @@ macro_rules! box_data_type_newtype { &self.0 } - fn inner(&self) -> &dyn peace_resources_rt::type_reg::untagged::DataType { + fn inner(&self) -> &dyn peace_resource_rt::type_reg::untagged::DataType { &self.0 } } diff --git a/crate/rt_model/src/outcomes/item_apply.rs b/crate/rt_model/src/outcomes/item_apply.rs index 5f71ec8cf..7664283ca 100644 --- a/crate/rt_model/src/outcomes/item_apply.rs +++ b/crate/rt_model/src/outcomes/item_apply.rs @@ -1,7 +1,7 @@ use std::fmt::{Debug, Display}; use peace_cfg::ApplyCheck; -use peace_resources_rt::type_reg::untagged::{BoxDtDisplay, DataType}; +use peace_resource_rt::type_reg::untagged::{BoxDtDisplay, DataType}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use crate::outcomes::{ItemApplyPartial, ItemApplyRt}; diff --git a/crate/rt_model/src/outcomes/item_apply_partial.rs b/crate/rt_model/src/outcomes/item_apply_partial.rs index 65f386b4b..8d53207c6 100644 --- a/crate/rt_model/src/outcomes/item_apply_partial.rs +++ b/crate/rt_model/src/outcomes/item_apply_partial.rs @@ -1,7 +1,7 @@ use std::fmt::{Debug, Display}; use peace_cfg::ApplyCheck; -use peace_resources_rt::type_reg::untagged::{BoxDtDisplay, DataType}; +use peace_resource_rt::type_reg::untagged::{BoxDtDisplay, DataType}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use crate::outcomes::ItemApplyPartialRt; diff --git a/crate/rt_model/src/outcomes/item_apply_partial_rt.rs b/crate/rt_model/src/outcomes/item_apply_partial_rt.rs index b79d76d9e..f0cf0ab73 100644 --- a/crate/rt_model/src/outcomes/item_apply_partial_rt.rs +++ b/crate/rt_model/src/outcomes/item_apply_partial_rt.rs @@ -1,5 +1,5 @@ use peace_cfg::ApplyCheck; -use peace_resources_rt::type_reg::untagged::{BoxDtDisplay, DataType}; +use peace_resource_rt::type_reg::untagged::{BoxDtDisplay, DataType}; /// Trait to allow inspecting a type-erased `ItemApplyPartial`. pub trait ItemApplyPartialRt: DataType { diff --git a/crate/rt_model/src/outcomes/item_apply_rt.rs b/crate/rt_model/src/outcomes/item_apply_rt.rs index 54701f344..eb5a6eb64 100644 --- a/crate/rt_model/src/outcomes/item_apply_rt.rs +++ b/crate/rt_model/src/outcomes/item_apply_rt.rs @@ -1,5 +1,5 @@ use peace_cfg::ApplyCheck; -use peace_resources_rt::type_reg::untagged::{BoxDtDisplay, DataType}; +use peace_resource_rt::type_reg::untagged::{BoxDtDisplay, DataType}; /// Trait to allow inspecting a type-erased `ItemApply`. pub trait ItemApplyRt: DataType { diff --git a/crate/rt_model/src/params_specs_serializer.rs b/crate/rt_model/src/params_specs_serializer.rs index 7b202c902..258b4d119 100644 --- a/crate/rt_model/src/params_specs_serializer.rs +++ b/crate/rt_model/src/params_specs_serializer.rs @@ -2,7 +2,7 @@ use std::marker::PhantomData; use peace_cfg::{FlowId, Profile}; use peace_params::ParamsSpecs; -use peace_resources_rt::{paths::ParamsSpecsFile, type_reg::untagged::TypeMapOpt}; +use peace_resource_rt::{paths::ParamsSpecsFile, type_reg::untagged::TypeMapOpt}; use crate::{Error, ParamsSpecsTypeReg, Storage}; diff --git a/crate/rt_model/src/params_specs_type_reg.rs b/crate/rt_model/src/params_specs_type_reg.rs index 84e13d1d5..ed141bc43 100644 --- a/crate/rt_model/src/params_specs_type_reg.rs +++ b/crate/rt_model/src/params_specs_type_reg.rs @@ -2,7 +2,7 @@ use std::ops::{Deref, DerefMut}; use peace_cfg::ItemId; use peace_params::AnySpecRtBoxed; -use peace_resources_rt::type_reg::untagged::TypeReg; +use peace_resource_rt::type_reg::untagged::TypeReg; /// Type registry for each item's [`Params`]'s Spec. /// @@ -12,7 +12,7 @@ use peace_resources_rt::type_reg::untagged::TypeReg; /// [`AnySpecRtBoxed`]. /// /// [`AnySpecRtBoxed`]: peace_params::AnySpecRtBoxed -/// [`BoxDtDisplay`]: peace_resources_rt::type_reg::untagged::BoxDtDisplay +/// [`BoxDtDisplay`]: peace_resource_rt::type_reg::untagged::BoxDtDisplay /// [`Params`]: peace_cfg::Item::Params /// [`StatesTypeReg`]: crate::StatesTypeReg #[derive(Debug, Default)] diff --git a/crate/rt_model/src/states_serializer.rs b/crate/rt_model/src/states_serializer.rs index afeb4d8a8..2de728c3e 100644 --- a/crate/rt_model/src/states_serializer.rs +++ b/crate/rt_model/src/states_serializer.rs @@ -1,7 +1,7 @@ use std::{marker::PhantomData, path::Path}; use peace_cfg::{FlowId, ItemId}; -use peace_resources_rt::{ +use peace_resource_rt::{ paths::{StatesCurrentFile, StatesGoalFile}, states::{ ts::{CurrentStored, GoalStored}, @@ -155,8 +155,8 @@ where /// [`ts::CurrentStored`]. /// /// [`Item`]: peace_cfg::Item - /// [`ts::Current`]: peace_resources_rt::states::ts::Current - /// [`ts::CurrentStored`]: peace_resources_rt::states::ts::CurrentStored + /// [`ts::Current`]: peace_resource_rt::states::ts::Current + /// [`ts::CurrentStored`]: peace_resource_rt::states::ts::CurrentStored #[cfg(not(target_arch = "wasm32"))] async fn deserialize_internal( thread_name: String, @@ -223,8 +223,8 @@ where /// [`ts::CurrentStored`]. /// /// [`Item`]: peace_cfg::Item - /// [`ts::Current`]: peace_resources_rt::states::ts::Current - /// [`ts::CurrentStored`]: peace_resources_rt::states::ts::CurrentStored + /// [`ts::Current`]: peace_resource_rt::states::ts::Current + /// [`ts::CurrentStored`]: peace_resource_rt::states::ts::CurrentStored #[cfg(target_arch = "wasm32")] async fn deserialize_internal( flow_id: &FlowId, diff --git a/crate/rt_model/src/states_type_reg.rs b/crate/rt_model/src/states_type_reg.rs index a178f1cf2..85c0152f9 100644 --- a/crate/rt_model/src/states_type_reg.rs +++ b/crate/rt_model/src/states_type_reg.rs @@ -1,7 +1,7 @@ use std::ops::{Deref, DerefMut}; use peace_cfg::ItemId; -use peace_resources_rt::type_reg::untagged::{BoxDtDisplay, TypeReg}; +use peace_resource_rt::type_reg::untagged::{BoxDtDisplay, TypeReg}; /// Type registry for each item's `State`. /// @@ -10,12 +10,12 @@ use peace_resources_rt::type_reg::untagged::{BoxDtDisplay, TypeReg}; /// Note: [`ItemParamsTypeReg`] uses [`BoxDt`], whereas this uses /// [`BoxDtDisplay`]. /// -/// [`BoxDt`]: peace_resources_rt::type_reg::untagged::BoxDt -/// [`BoxDtDisplay`]: peace_resources_rt::type_reg::untagged::BoxDtDisplay +/// [`BoxDt`]: peace_resource_rt::type_reg::untagged::BoxDt +/// [`BoxDtDisplay`]: peace_resource_rt::type_reg::untagged::BoxDtDisplay /// [`ItemParamsTypeReg`]: crate::ItemParamsTypeReg /// [`Params`]: peace_cfg::Item::Params -/// [`StatesGoalFile`]: peace_resources_rt::paths::StatesGoalFile -/// [`StatesCurrentFile`]: peace_resources_rt::paths::StatesCurrentFile +/// [`StatesGoalFile`]: peace_resource_rt::paths::StatesGoalFile +/// [`StatesCurrentFile`]: peace_resource_rt::paths::StatesCurrentFile #[derive(Debug, Default)] pub struct StatesTypeReg(TypeReg); diff --git a/crate/rt_model_core/Cargo.toml b/crate/rt_model_core/Cargo.toml index 64a111f7f..04ee355d4 100644 --- a/crate/rt_model_core/Cargo.toml +++ b/crate/rt_model_core/Cargo.toml @@ -29,7 +29,7 @@ peace_core = { workspace = true } peace_cmd_model = { workspace = true } peace_fmt = { workspace = true } peace_params = { workspace = true } -peace_resources_rt = { workspace = true } +peace_resource_rt = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } serde_yaml = { workspace = true } diff --git a/crate/rt_model_core/src/error.rs b/crate/rt_model_core/src/error.rs index d86e34e78..0fa22df34 100644 --- a/crate/rt_model_core/src/error.rs +++ b/crate/rt_model_core/src/error.rs @@ -3,7 +3,7 @@ use std::path::PathBuf; use peace_cmd_model::CmdExecutionError; use peace_core::{FlowId, ItemId, Profile}; use peace_params::{ParamsResolveError, ParamsSpecs}; -use peace_resources_rt::paths::ParamsSpecsFile; +use peace_resource_rt::paths::ParamsSpecsFile; pub use self::{apply_cmd_error::ApplyCmdError, state_downcast_error::StateDowncastError}; diff --git a/crate/rt_model_core/src/error/native_error.rs b/crate/rt_model_core/src/error/native_error.rs index e98052d88..1e037064e 100644 --- a/crate/rt_model_core/src/error/native_error.rs +++ b/crate/rt_model_core/src/error/native_error.rs @@ -1,7 +1,7 @@ use std::{ffi::OsString, path::PathBuf, sync::Mutex}; use peace_core::ProfileInvalidFmt; -use peace_resources_rt::paths::WorkspaceDir; +use peace_resource_rt::paths::WorkspaceDir; /// Peace runtime errors. #[cfg_attr(feature = "error_reporting", derive(miette::Diagnostic))] diff --git a/crate/rt_model_core/src/params/params_type_regs.rs b/crate/rt_model_core/src/params/params_type_regs.rs index 83734fe65..6bb82d7fc 100644 --- a/crate/rt_model_core/src/params/params_type_regs.rs +++ b/crate/rt_model_core/src/params/params_type_regs.rs @@ -7,9 +7,9 @@ use crate::params::{KeyMaybe, KeyUnknown, ParamsKeys, ParamsKeysImpl, ParamsType /// Type registries to deserialize [`WorkspaceParamsFile`], /// [`ProfileParamsFile`] and [`FlowParamsFile`]. /// -/// [`WorkspaceParamsFile`]: peace_resources_rt::internal::WorkspaceParamsFile -/// [`ProfileParamsFile`]: peace_resources_rt::internal::ProfileParamsFile -/// [`FlowParamsFile`]: peace_resources_rt::internal::FlowParamsFile +/// [`WorkspaceParamsFile`]: peace_resource_rt::internal::WorkspaceParamsFile +/// [`ProfileParamsFile`]: peace_resource_rt::internal::ProfileParamsFile +/// [`FlowParamsFile`]: peace_resource_rt::internal::FlowParamsFile #[derive(Debug)] pub struct ParamsTypeRegs where diff --git a/crate/rt_model_core/src/params/params_type_regs_builder.rs b/crate/rt_model_core/src/params/params_type_regs_builder.rs index a888d0ef8..13ccc743c 100644 --- a/crate/rt_model_core/src/params/params_type_regs_builder.rs +++ b/crate/rt_model_core/src/params/params_type_regs_builder.rs @@ -8,9 +8,9 @@ use crate::params::{KeyKnown, KeyMaybe, KeyUnknown, ParamsKeys, ParamsKeysImpl, /// Type registries to deserialize [`WorkspaceParamsFile`], /// [`ProfileParamsFile`] and [`FlowParamsFile`]. /// -/// [`WorkspaceParamsFile`]: peace_resources_rt::internal::WorkspaceParamsFile -/// [`ProfileParamsFile`]: peace_resources_rt::internal::ProfileParamsFile -/// [`FlowParamsFile`]: peace_resources_rt::internal::FlowParamsFile +/// [`WorkspaceParamsFile`]: peace_resource_rt::internal::WorkspaceParamsFile +/// [`ProfileParamsFile`]: peace_resource_rt::internal::ProfileParamsFile +/// [`FlowParamsFile`]: peace_resource_rt::internal::FlowParamsFile #[derive(Debug)] pub struct ParamsTypeRegsBuilder where diff --git a/crate/rt_model_native/Cargo.toml b/crate/rt_model_native/Cargo.toml index 649a18c34..fca587323 100644 --- a/crate/rt_model_native/Cargo.toml +++ b/crate/rt_model_native/Cargo.toml @@ -22,7 +22,7 @@ test = false [dependencies] futures = { workspace = true } peace_core = { workspace = true } -peace_resources_rt = { workspace = true } +peace_resource_rt = { workspace = true } peace_rt_model_core = { workspace = true } serde = { workspace = true } serde_yaml = { workspace = true } diff --git a/crate/rt_model_native/src/storage.rs b/crate/rt_model_native/src/storage.rs index cfa657b46..0b089c8ac 100644 --- a/crate/rt_model_native/src/storage.rs +++ b/crate/rt_model_native/src/storage.rs @@ -1,6 +1,6 @@ use std::{fmt::Debug, hash::Hash, io::Write, path::Path, sync::Mutex}; -use peace_resources_rt::type_reg::{ +use peace_resource_rt::type_reg::{ common::UnknownEntriesSome, untagged::{DataTypeWrapper, TypeMapOpt, TypeReg}, }; diff --git a/crate/rt_model_native/src/workspace.rs b/crate/rt_model_native/src/workspace.rs index 8e558fbd2..eae3d5699 100644 --- a/crate/rt_model_native/src/workspace.rs +++ b/crate/rt_model_native/src/workspace.rs @@ -8,7 +8,7 @@ //! * A workflow that the command is executing, identified by the [`FlowId`]. use peace_core::AppName; -use peace_resources_rt::internal::WorkspaceDirs; +use peace_resource_rt::internal::WorkspaceDirs; use peace_rt_model_core::Error; use crate::{Storage, WorkspaceDirsBuilder, WorkspaceSpec}; diff --git a/crate/rt_model_native/src/workspace_dirs_builder.rs b/crate/rt_model_native/src/workspace_dirs_builder.rs index 51d2a0a10..4b57f1cf5 100644 --- a/crate/rt_model_native/src/workspace_dirs_builder.rs +++ b/crate/rt_model_native/src/workspace_dirs_builder.rs @@ -4,7 +4,7 @@ use std::{ }; use peace_core::AppName; -use peace_resources_rt::{ +use peace_resource_rt::{ internal::WorkspaceDirs, paths::{PeaceAppDir, PeaceDir}, }; @@ -22,7 +22,7 @@ impl WorkspaceDirsBuilder { app_name: &AppName, workspace_spec: WorkspaceSpec, ) -> Result { - use peace_resources_rt::paths::WorkspaceDir; + use peace_resource_rt::paths::WorkspaceDir; let workspace_dir = { let working_dir = std::env::current_dir() diff --git a/crate/rt_model_native/src/workspace_initializer.rs b/crate/rt_model_native/src/workspace_initializer.rs index 1ab118407..eecb6f6fa 100644 --- a/crate/rt_model_native/src/workspace_initializer.rs +++ b/crate/rt_model_native/src/workspace_initializer.rs @@ -2,7 +2,7 @@ use std::{fmt::Debug, hash::Hash, path::Path}; use futures::{stream, StreamExt, TryStreamExt}; -use peace_resources_rt::{ +use peace_resource_rt::{ internal::{FlowParamsFile, ProfileParamsFile, WorkspaceParamsFile}, type_reg::untagged::{TypeMapOpt, TypeReg}, }; diff --git a/crate/rt_model_web/Cargo.toml b/crate/rt_model_web/Cargo.toml index f00fc70dd..a60f63b00 100644 --- a/crate/rt_model_web/Cargo.toml +++ b/crate/rt_model_web/Cargo.toml @@ -22,7 +22,7 @@ test = false [dependencies] base64 = { workspace = true } peace_core = { workspace = true } -peace_resources_rt = { workspace = true } +peace_resource_rt = { workspace = true } peace_rt_model_core = { workspace = true } serde = { workspace = true } serde-wasm-bindgen = { workspace = true } diff --git a/crate/rt_model_web/src/storage.rs b/crate/rt_model_web/src/storage.rs index d10741c8d..905d6dc8d 100644 --- a/crate/rt_model_web/src/storage.rs +++ b/crate/rt_model_web/src/storage.rs @@ -5,7 +5,7 @@ use std::{ }; use base64::Engine; -use peace_resources_rt::type_reg::{ +use peace_resource_rt::type_reg::{ common::UnknownEntriesSome, untagged::{DataTypeWrapper, TypeMapOpt, TypeReg}, }; diff --git a/crate/rt_model_web/src/workspace.rs b/crate/rt_model_web/src/workspace.rs index 2572e2f7a..a8227b6c6 100644 --- a/crate/rt_model_web/src/workspace.rs +++ b/crate/rt_model_web/src/workspace.rs @@ -8,7 +8,7 @@ //! * A workflow that the command is executing, identified by the [`FlowId`]. use peace_core::AppName; -use peace_resources_rt::internal::WorkspaceDirs; +use peace_resource_rt::internal::WorkspaceDirs; use peace_rt_model_core::Error; use crate::{Storage, WorkspaceDirsBuilder, WorkspaceSpec}; diff --git a/crate/rt_model_web/src/workspace_dirs_builder.rs b/crate/rt_model_web/src/workspace_dirs_builder.rs index 450219d59..ddbd05eaa 100644 --- a/crate/rt_model_web/src/workspace_dirs_builder.rs +++ b/crate/rt_model_web/src/workspace_dirs_builder.rs @@ -1,7 +1,7 @@ use std::path::PathBuf; use peace_core::AppName; -use peace_resources_rt::{ +use peace_resource_rt::{ internal::WorkspaceDirs, paths::{PeaceAppDir, PeaceDir}, }; diff --git a/crate/rt_model_web/src/workspace_initializer.rs b/crate/rt_model_web/src/workspace_initializer.rs index 958b558c2..122a59ff7 100644 --- a/crate/rt_model_web/src/workspace_initializer.rs +++ b/crate/rt_model_web/src/workspace_initializer.rs @@ -1,6 +1,6 @@ use std::{fmt::Debug, hash::Hash, path::Path}; -use peace_resources_rt::{ +use peace_resource_rt::{ internal::{FlowParamsFile, ProfileParamsFile, WorkspaceParamsFile}, type_reg::untagged::{TypeMapOpt, TypeReg}, }; From 1df670aca5b2d38fef4011280fc391c74c74547b Mon Sep 17 00:00:00 2001 From: Azriel Hoh Date: Mon, 3 Jun 2024 11:49:16 +1200 Subject: [PATCH 2/6] Move `resources_rt` folders to `resource_rt`. --- crate/{resources_rt => resource_rt}/Cargo.toml | 0 crate/{resources_rt => resource_rt}/src/internal.rs | 0 .../src/internal/flow_params_file.rs | 0 .../src/internal/profile_params_file.rs | 0 .../src/internal/state_diffs_mut.rs | 0 crate/{resources_rt => resource_rt}/src/internal/states_mut.rs | 0 .../src/internal/workspace_dirs.rs | 0 .../src/internal/workspace_params_file.rs | 0 crate/{resources_rt => resource_rt}/src/item_rt_id.rs | 0 crate/{resources_rt => resource_rt}/src/lib.rs | 0 crate/{resources_rt => resource_rt}/src/paths.rs | 0 crate/{resources_rt => resource_rt}/src/paths/flow_dir.rs | 0 .../src/paths/params_specs_file.rs | 0 crate/{resources_rt => resource_rt}/src/paths/peace_app_dir.rs | 0 crate/{resources_rt => resource_rt}/src/paths/peace_dir.rs | 0 crate/{resources_rt => resource_rt}/src/paths/profile_dir.rs | 0 .../src/paths/profile_history_dir.rs | 0 .../src/paths/states_current_file.rs | 0 .../{resources_rt => resource_rt}/src/paths/states_goal_file.rs | 0 crate/{resources_rt => resource_rt}/src/paths/workspace_dir.rs | 0 crate/{resources_rt => resource_rt}/src/resources.rs | 0 crate/{resources_rt => resource_rt}/src/resources/ts.rs | 0 crate/{resources_rt => resource_rt}/src/states.rs | 0 crate/{resources_rt => resource_rt}/src/states/state_diffs.rs | 0 crate/{resources_rt => resource_rt}/src/states/states_clean.rs | 0 .../{resources_rt => resource_rt}/src/states/states_cleaned.rs | 0 .../src/states/states_cleaned_dry.rs | 0 .../{resources_rt => resource_rt}/src/states/states_current.rs | 0 .../src/states/states_current_stored.rs | 0 .../{resources_rt => resource_rt}/src/states/states_ensured.rs | 0 .../src/states/states_ensured_dry.rs | 0 crate/{resources_rt => resource_rt}/src/states/states_goal.rs | 0 .../src/states/states_goal_stored.rs | 0 .../{resources_rt => resource_rt}/src/states/states_previous.rs | 0 crate/{resources_rt => resource_rt}/src/states/states_serde.rs | 0 crate/{resources_rt => resource_rt}/src/states/ts.rs | 0 workspace_tests/src/lib.rs | 2 +- workspace_tests/src/{resources_rt.rs => resource_rt.rs} | 0 workspace_tests/src/{resources_rt => resource_rt}/dir.rs | 0 .../src/{resources_rt => resource_rt}/dir/peace_dir.rs | 0 .../src/{resources_rt => resource_rt}/dir/profile_dir.rs | 0 .../{resources_rt => resource_rt}/dir/profile_history_dir.rs | 0 .../{resources_rt => resource_rt}/dir/states_current_file.rs | 0 .../src/{resources_rt => resource_rt}/dir/states_goal_file.rs | 0 .../src/{resources_rt => resource_rt}/dir/workspace_dir.rs | 0 workspace_tests/src/{resources_rt => resource_rt}/internal.rs | 0 .../{resources_rt => resource_rt}/internal/flow_params_file.rs | 0 .../internal/profile_params_file.rs | 0 .../{resources_rt => resource_rt}/internal/state_diffs_mut.rs | 0 .../src/{resources_rt => resource_rt}/internal/states_mut.rs | 0 .../{resources_rt => resource_rt}/internal/workspace_dirs.rs | 0 .../internal/workspace_params_file.rs | 0 workspace_tests/src/{resources_rt => resource_rt}/resources.rs | 0 .../src/{resources_rt => resource_rt}/resources/ts.rs | 0 .../src/{resources_rt => resource_rt}/state_diffs.rs | 0 workspace_tests/src/{resources_rt => resource_rt}/states.rs | 0 .../src/{resources_rt => resource_rt}/states/states_cleaned.rs | 0 .../{resources_rt => resource_rt}/states/states_cleaned_dry.rs | 0 .../src/{resources_rt => resource_rt}/states/states_current.rs | 0 .../states/states_current_stored.rs | 0 .../src/{resources_rt => resource_rt}/states/states_ensured.rs | 0 .../{resources_rt => resource_rt}/states/states_ensured_dry.rs | 0 .../src/{resources_rt => resource_rt}/states/states_goal.rs | 0 .../{resources_rt => resource_rt}/states/states_goal_stored.rs | 0 .../src/{resources_rt => resource_rt}/states/states_previous.rs | 0 workspace_tests/src/{resources_rt => resource_rt}/states/ts.rs | 0 66 files changed, 1 insertion(+), 1 deletion(-) rename crate/{resources_rt => resource_rt}/Cargo.toml (100%) rename crate/{resources_rt => resource_rt}/src/internal.rs (100%) rename crate/{resources_rt => resource_rt}/src/internal/flow_params_file.rs (100%) rename crate/{resources_rt => resource_rt}/src/internal/profile_params_file.rs (100%) rename crate/{resources_rt => resource_rt}/src/internal/state_diffs_mut.rs (100%) rename crate/{resources_rt => resource_rt}/src/internal/states_mut.rs (100%) rename crate/{resources_rt => resource_rt}/src/internal/workspace_dirs.rs (100%) rename crate/{resources_rt => resource_rt}/src/internal/workspace_params_file.rs (100%) rename crate/{resources_rt => resource_rt}/src/item_rt_id.rs (100%) rename crate/{resources_rt => resource_rt}/src/lib.rs (100%) rename crate/{resources_rt => resource_rt}/src/paths.rs (100%) rename crate/{resources_rt => resource_rt}/src/paths/flow_dir.rs (100%) rename crate/{resources_rt => resource_rt}/src/paths/params_specs_file.rs (100%) rename crate/{resources_rt => resource_rt}/src/paths/peace_app_dir.rs (100%) rename crate/{resources_rt => resource_rt}/src/paths/peace_dir.rs (100%) rename crate/{resources_rt => resource_rt}/src/paths/profile_dir.rs (100%) rename crate/{resources_rt => resource_rt}/src/paths/profile_history_dir.rs (100%) rename crate/{resources_rt => resource_rt}/src/paths/states_current_file.rs (100%) rename crate/{resources_rt => resource_rt}/src/paths/states_goal_file.rs (100%) rename crate/{resources_rt => resource_rt}/src/paths/workspace_dir.rs (100%) rename crate/{resources_rt => resource_rt}/src/resources.rs (100%) rename crate/{resources_rt => resource_rt}/src/resources/ts.rs (100%) rename crate/{resources_rt => resource_rt}/src/states.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/state_diffs.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/states_clean.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/states_cleaned.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/states_cleaned_dry.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/states_current.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/states_current_stored.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/states_ensured.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/states_ensured_dry.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/states_goal.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/states_goal_stored.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/states_previous.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/states_serde.rs (100%) rename crate/{resources_rt => resource_rt}/src/states/ts.rs (100%) rename workspace_tests/src/{resources_rt.rs => resource_rt.rs} (100%) rename workspace_tests/src/{resources_rt => resource_rt}/dir.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/dir/peace_dir.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/dir/profile_dir.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/dir/profile_history_dir.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/dir/states_current_file.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/dir/states_goal_file.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/dir/workspace_dir.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/internal.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/internal/flow_params_file.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/internal/profile_params_file.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/internal/state_diffs_mut.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/internal/states_mut.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/internal/workspace_dirs.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/internal/workspace_params_file.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/resources.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/resources/ts.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/state_diffs.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/states.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/states/states_cleaned.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/states/states_cleaned_dry.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/states/states_current.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/states/states_current_stored.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/states/states_ensured.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/states/states_ensured_dry.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/states/states_goal.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/states/states_goal_stored.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/states/states_previous.rs (100%) rename workspace_tests/src/{resources_rt => resource_rt}/states/ts.rs (100%) diff --git a/crate/resources_rt/Cargo.toml b/crate/resource_rt/Cargo.toml similarity index 100% rename from crate/resources_rt/Cargo.toml rename to crate/resource_rt/Cargo.toml diff --git a/crate/resources_rt/src/internal.rs b/crate/resource_rt/src/internal.rs similarity index 100% rename from crate/resources_rt/src/internal.rs rename to crate/resource_rt/src/internal.rs diff --git a/crate/resources_rt/src/internal/flow_params_file.rs b/crate/resource_rt/src/internal/flow_params_file.rs similarity index 100% rename from crate/resources_rt/src/internal/flow_params_file.rs rename to crate/resource_rt/src/internal/flow_params_file.rs diff --git a/crate/resources_rt/src/internal/profile_params_file.rs b/crate/resource_rt/src/internal/profile_params_file.rs similarity index 100% rename from crate/resources_rt/src/internal/profile_params_file.rs rename to crate/resource_rt/src/internal/profile_params_file.rs diff --git a/crate/resources_rt/src/internal/state_diffs_mut.rs b/crate/resource_rt/src/internal/state_diffs_mut.rs similarity index 100% rename from crate/resources_rt/src/internal/state_diffs_mut.rs rename to crate/resource_rt/src/internal/state_diffs_mut.rs diff --git a/crate/resources_rt/src/internal/states_mut.rs b/crate/resource_rt/src/internal/states_mut.rs similarity index 100% rename from crate/resources_rt/src/internal/states_mut.rs rename to crate/resource_rt/src/internal/states_mut.rs diff --git a/crate/resources_rt/src/internal/workspace_dirs.rs b/crate/resource_rt/src/internal/workspace_dirs.rs similarity index 100% rename from crate/resources_rt/src/internal/workspace_dirs.rs rename to crate/resource_rt/src/internal/workspace_dirs.rs diff --git a/crate/resources_rt/src/internal/workspace_params_file.rs b/crate/resource_rt/src/internal/workspace_params_file.rs similarity index 100% rename from crate/resources_rt/src/internal/workspace_params_file.rs rename to crate/resource_rt/src/internal/workspace_params_file.rs diff --git a/crate/resources_rt/src/item_rt_id.rs b/crate/resource_rt/src/item_rt_id.rs similarity index 100% rename from crate/resources_rt/src/item_rt_id.rs rename to crate/resource_rt/src/item_rt_id.rs diff --git a/crate/resources_rt/src/lib.rs b/crate/resource_rt/src/lib.rs similarity index 100% rename from crate/resources_rt/src/lib.rs rename to crate/resource_rt/src/lib.rs diff --git a/crate/resources_rt/src/paths.rs b/crate/resource_rt/src/paths.rs similarity index 100% rename from crate/resources_rt/src/paths.rs rename to crate/resource_rt/src/paths.rs diff --git a/crate/resources_rt/src/paths/flow_dir.rs b/crate/resource_rt/src/paths/flow_dir.rs similarity index 100% rename from crate/resources_rt/src/paths/flow_dir.rs rename to crate/resource_rt/src/paths/flow_dir.rs diff --git a/crate/resources_rt/src/paths/params_specs_file.rs b/crate/resource_rt/src/paths/params_specs_file.rs similarity index 100% rename from crate/resources_rt/src/paths/params_specs_file.rs rename to crate/resource_rt/src/paths/params_specs_file.rs diff --git a/crate/resources_rt/src/paths/peace_app_dir.rs b/crate/resource_rt/src/paths/peace_app_dir.rs similarity index 100% rename from crate/resources_rt/src/paths/peace_app_dir.rs rename to crate/resource_rt/src/paths/peace_app_dir.rs diff --git a/crate/resources_rt/src/paths/peace_dir.rs b/crate/resource_rt/src/paths/peace_dir.rs similarity index 100% rename from crate/resources_rt/src/paths/peace_dir.rs rename to crate/resource_rt/src/paths/peace_dir.rs diff --git a/crate/resources_rt/src/paths/profile_dir.rs b/crate/resource_rt/src/paths/profile_dir.rs similarity index 100% rename from crate/resources_rt/src/paths/profile_dir.rs rename to crate/resource_rt/src/paths/profile_dir.rs diff --git a/crate/resources_rt/src/paths/profile_history_dir.rs b/crate/resource_rt/src/paths/profile_history_dir.rs similarity index 100% rename from crate/resources_rt/src/paths/profile_history_dir.rs rename to crate/resource_rt/src/paths/profile_history_dir.rs diff --git a/crate/resources_rt/src/paths/states_current_file.rs b/crate/resource_rt/src/paths/states_current_file.rs similarity index 100% rename from crate/resources_rt/src/paths/states_current_file.rs rename to crate/resource_rt/src/paths/states_current_file.rs diff --git a/crate/resources_rt/src/paths/states_goal_file.rs b/crate/resource_rt/src/paths/states_goal_file.rs similarity index 100% rename from crate/resources_rt/src/paths/states_goal_file.rs rename to crate/resource_rt/src/paths/states_goal_file.rs diff --git a/crate/resources_rt/src/paths/workspace_dir.rs b/crate/resource_rt/src/paths/workspace_dir.rs similarity index 100% rename from crate/resources_rt/src/paths/workspace_dir.rs rename to crate/resource_rt/src/paths/workspace_dir.rs diff --git a/crate/resources_rt/src/resources.rs b/crate/resource_rt/src/resources.rs similarity index 100% rename from crate/resources_rt/src/resources.rs rename to crate/resource_rt/src/resources.rs diff --git a/crate/resources_rt/src/resources/ts.rs b/crate/resource_rt/src/resources/ts.rs similarity index 100% rename from crate/resources_rt/src/resources/ts.rs rename to crate/resource_rt/src/resources/ts.rs diff --git a/crate/resources_rt/src/states.rs b/crate/resource_rt/src/states.rs similarity index 100% rename from crate/resources_rt/src/states.rs rename to crate/resource_rt/src/states.rs diff --git a/crate/resources_rt/src/states/state_diffs.rs b/crate/resource_rt/src/states/state_diffs.rs similarity index 100% rename from crate/resources_rt/src/states/state_diffs.rs rename to crate/resource_rt/src/states/state_diffs.rs diff --git a/crate/resources_rt/src/states/states_clean.rs b/crate/resource_rt/src/states/states_clean.rs similarity index 100% rename from crate/resources_rt/src/states/states_clean.rs rename to crate/resource_rt/src/states/states_clean.rs diff --git a/crate/resources_rt/src/states/states_cleaned.rs b/crate/resource_rt/src/states/states_cleaned.rs similarity index 100% rename from crate/resources_rt/src/states/states_cleaned.rs rename to crate/resource_rt/src/states/states_cleaned.rs diff --git a/crate/resources_rt/src/states/states_cleaned_dry.rs b/crate/resource_rt/src/states/states_cleaned_dry.rs similarity index 100% rename from crate/resources_rt/src/states/states_cleaned_dry.rs rename to crate/resource_rt/src/states/states_cleaned_dry.rs diff --git a/crate/resources_rt/src/states/states_current.rs b/crate/resource_rt/src/states/states_current.rs similarity index 100% rename from crate/resources_rt/src/states/states_current.rs rename to crate/resource_rt/src/states/states_current.rs diff --git a/crate/resources_rt/src/states/states_current_stored.rs b/crate/resource_rt/src/states/states_current_stored.rs similarity index 100% rename from crate/resources_rt/src/states/states_current_stored.rs rename to crate/resource_rt/src/states/states_current_stored.rs diff --git a/crate/resources_rt/src/states/states_ensured.rs b/crate/resource_rt/src/states/states_ensured.rs similarity index 100% rename from crate/resources_rt/src/states/states_ensured.rs rename to crate/resource_rt/src/states/states_ensured.rs diff --git a/crate/resources_rt/src/states/states_ensured_dry.rs b/crate/resource_rt/src/states/states_ensured_dry.rs similarity index 100% rename from crate/resources_rt/src/states/states_ensured_dry.rs rename to crate/resource_rt/src/states/states_ensured_dry.rs diff --git a/crate/resources_rt/src/states/states_goal.rs b/crate/resource_rt/src/states/states_goal.rs similarity index 100% rename from crate/resources_rt/src/states/states_goal.rs rename to crate/resource_rt/src/states/states_goal.rs diff --git a/crate/resources_rt/src/states/states_goal_stored.rs b/crate/resource_rt/src/states/states_goal_stored.rs similarity index 100% rename from crate/resources_rt/src/states/states_goal_stored.rs rename to crate/resource_rt/src/states/states_goal_stored.rs diff --git a/crate/resources_rt/src/states/states_previous.rs b/crate/resource_rt/src/states/states_previous.rs similarity index 100% rename from crate/resources_rt/src/states/states_previous.rs rename to crate/resource_rt/src/states/states_previous.rs diff --git a/crate/resources_rt/src/states/states_serde.rs b/crate/resource_rt/src/states/states_serde.rs similarity index 100% rename from crate/resources_rt/src/states/states_serde.rs rename to crate/resource_rt/src/states/states_serde.rs diff --git a/crate/resources_rt/src/states/ts.rs b/crate/resource_rt/src/states/ts.rs similarity index 100% rename from crate/resources_rt/src/states/ts.rs rename to crate/resource_rt/src/states/ts.rs diff --git a/workspace_tests/src/lib.rs b/workspace_tests/src/lib.rs index 16959843a..8d41c5e9c 100644 --- a/workspace_tests/src/lib.rs +++ b/workspace_tests/src/lib.rs @@ -26,7 +26,7 @@ mod diff; mod flow_model; mod fmt; mod params; -mod resources_rt; +mod resource_rt; mod rt; mod rt_model; #[cfg(feature = "webi")] diff --git a/workspace_tests/src/resources_rt.rs b/workspace_tests/src/resource_rt.rs similarity index 100% rename from workspace_tests/src/resources_rt.rs rename to workspace_tests/src/resource_rt.rs diff --git a/workspace_tests/src/resources_rt/dir.rs b/workspace_tests/src/resource_rt/dir.rs similarity index 100% rename from workspace_tests/src/resources_rt/dir.rs rename to workspace_tests/src/resource_rt/dir.rs diff --git a/workspace_tests/src/resources_rt/dir/peace_dir.rs b/workspace_tests/src/resource_rt/dir/peace_dir.rs similarity index 100% rename from workspace_tests/src/resources_rt/dir/peace_dir.rs rename to workspace_tests/src/resource_rt/dir/peace_dir.rs diff --git a/workspace_tests/src/resources_rt/dir/profile_dir.rs b/workspace_tests/src/resource_rt/dir/profile_dir.rs similarity index 100% rename from workspace_tests/src/resources_rt/dir/profile_dir.rs rename to workspace_tests/src/resource_rt/dir/profile_dir.rs diff --git a/workspace_tests/src/resources_rt/dir/profile_history_dir.rs b/workspace_tests/src/resource_rt/dir/profile_history_dir.rs similarity index 100% rename from workspace_tests/src/resources_rt/dir/profile_history_dir.rs rename to workspace_tests/src/resource_rt/dir/profile_history_dir.rs diff --git a/workspace_tests/src/resources_rt/dir/states_current_file.rs b/workspace_tests/src/resource_rt/dir/states_current_file.rs similarity index 100% rename from workspace_tests/src/resources_rt/dir/states_current_file.rs rename to workspace_tests/src/resource_rt/dir/states_current_file.rs diff --git a/workspace_tests/src/resources_rt/dir/states_goal_file.rs b/workspace_tests/src/resource_rt/dir/states_goal_file.rs similarity index 100% rename from workspace_tests/src/resources_rt/dir/states_goal_file.rs rename to workspace_tests/src/resource_rt/dir/states_goal_file.rs diff --git a/workspace_tests/src/resources_rt/dir/workspace_dir.rs b/workspace_tests/src/resource_rt/dir/workspace_dir.rs similarity index 100% rename from workspace_tests/src/resources_rt/dir/workspace_dir.rs rename to workspace_tests/src/resource_rt/dir/workspace_dir.rs diff --git a/workspace_tests/src/resources_rt/internal.rs b/workspace_tests/src/resource_rt/internal.rs similarity index 100% rename from workspace_tests/src/resources_rt/internal.rs rename to workspace_tests/src/resource_rt/internal.rs diff --git a/workspace_tests/src/resources_rt/internal/flow_params_file.rs b/workspace_tests/src/resource_rt/internal/flow_params_file.rs similarity index 100% rename from workspace_tests/src/resources_rt/internal/flow_params_file.rs rename to workspace_tests/src/resource_rt/internal/flow_params_file.rs diff --git a/workspace_tests/src/resources_rt/internal/profile_params_file.rs b/workspace_tests/src/resource_rt/internal/profile_params_file.rs similarity index 100% rename from workspace_tests/src/resources_rt/internal/profile_params_file.rs rename to workspace_tests/src/resource_rt/internal/profile_params_file.rs diff --git a/workspace_tests/src/resources_rt/internal/state_diffs_mut.rs b/workspace_tests/src/resource_rt/internal/state_diffs_mut.rs similarity index 100% rename from workspace_tests/src/resources_rt/internal/state_diffs_mut.rs rename to workspace_tests/src/resource_rt/internal/state_diffs_mut.rs diff --git a/workspace_tests/src/resources_rt/internal/states_mut.rs b/workspace_tests/src/resource_rt/internal/states_mut.rs similarity index 100% rename from workspace_tests/src/resources_rt/internal/states_mut.rs rename to workspace_tests/src/resource_rt/internal/states_mut.rs diff --git a/workspace_tests/src/resources_rt/internal/workspace_dirs.rs b/workspace_tests/src/resource_rt/internal/workspace_dirs.rs similarity index 100% rename from workspace_tests/src/resources_rt/internal/workspace_dirs.rs rename to workspace_tests/src/resource_rt/internal/workspace_dirs.rs diff --git a/workspace_tests/src/resources_rt/internal/workspace_params_file.rs b/workspace_tests/src/resource_rt/internal/workspace_params_file.rs similarity index 100% rename from workspace_tests/src/resources_rt/internal/workspace_params_file.rs rename to workspace_tests/src/resource_rt/internal/workspace_params_file.rs diff --git a/workspace_tests/src/resources_rt/resources.rs b/workspace_tests/src/resource_rt/resources.rs similarity index 100% rename from workspace_tests/src/resources_rt/resources.rs rename to workspace_tests/src/resource_rt/resources.rs diff --git a/workspace_tests/src/resources_rt/resources/ts.rs b/workspace_tests/src/resource_rt/resources/ts.rs similarity index 100% rename from workspace_tests/src/resources_rt/resources/ts.rs rename to workspace_tests/src/resource_rt/resources/ts.rs diff --git a/workspace_tests/src/resources_rt/state_diffs.rs b/workspace_tests/src/resource_rt/state_diffs.rs similarity index 100% rename from workspace_tests/src/resources_rt/state_diffs.rs rename to workspace_tests/src/resource_rt/state_diffs.rs diff --git a/workspace_tests/src/resources_rt/states.rs b/workspace_tests/src/resource_rt/states.rs similarity index 100% rename from workspace_tests/src/resources_rt/states.rs rename to workspace_tests/src/resource_rt/states.rs diff --git a/workspace_tests/src/resources_rt/states/states_cleaned.rs b/workspace_tests/src/resource_rt/states/states_cleaned.rs similarity index 100% rename from workspace_tests/src/resources_rt/states/states_cleaned.rs rename to workspace_tests/src/resource_rt/states/states_cleaned.rs diff --git a/workspace_tests/src/resources_rt/states/states_cleaned_dry.rs b/workspace_tests/src/resource_rt/states/states_cleaned_dry.rs similarity index 100% rename from workspace_tests/src/resources_rt/states/states_cleaned_dry.rs rename to workspace_tests/src/resource_rt/states/states_cleaned_dry.rs diff --git a/workspace_tests/src/resources_rt/states/states_current.rs b/workspace_tests/src/resource_rt/states/states_current.rs similarity index 100% rename from workspace_tests/src/resources_rt/states/states_current.rs rename to workspace_tests/src/resource_rt/states/states_current.rs diff --git a/workspace_tests/src/resources_rt/states/states_current_stored.rs b/workspace_tests/src/resource_rt/states/states_current_stored.rs similarity index 100% rename from workspace_tests/src/resources_rt/states/states_current_stored.rs rename to workspace_tests/src/resource_rt/states/states_current_stored.rs diff --git a/workspace_tests/src/resources_rt/states/states_ensured.rs b/workspace_tests/src/resource_rt/states/states_ensured.rs similarity index 100% rename from workspace_tests/src/resources_rt/states/states_ensured.rs rename to workspace_tests/src/resource_rt/states/states_ensured.rs diff --git a/workspace_tests/src/resources_rt/states/states_ensured_dry.rs b/workspace_tests/src/resource_rt/states/states_ensured_dry.rs similarity index 100% rename from workspace_tests/src/resources_rt/states/states_ensured_dry.rs rename to workspace_tests/src/resource_rt/states/states_ensured_dry.rs diff --git a/workspace_tests/src/resources_rt/states/states_goal.rs b/workspace_tests/src/resource_rt/states/states_goal.rs similarity index 100% rename from workspace_tests/src/resources_rt/states/states_goal.rs rename to workspace_tests/src/resource_rt/states/states_goal.rs diff --git a/workspace_tests/src/resources_rt/states/states_goal_stored.rs b/workspace_tests/src/resource_rt/states/states_goal_stored.rs similarity index 100% rename from workspace_tests/src/resources_rt/states/states_goal_stored.rs rename to workspace_tests/src/resource_rt/states/states_goal_stored.rs diff --git a/workspace_tests/src/resources_rt/states/states_previous.rs b/workspace_tests/src/resource_rt/states/states_previous.rs similarity index 100% rename from workspace_tests/src/resources_rt/states/states_previous.rs rename to workspace_tests/src/resource_rt/states/states_previous.rs diff --git a/workspace_tests/src/resources_rt/states/ts.rs b/workspace_tests/src/resource_rt/states/ts.rs similarity index 100% rename from workspace_tests/src/resources_rt/states/ts.rs rename to workspace_tests/src/resource_rt/states/ts.rs From 20f4eda6f186c0307eef0b6892017e173367bffa Mon Sep 17 00:00:00 2001 From: Azriel Hoh Date: Mon, 3 Jun 2024 11:50:09 +1200 Subject: [PATCH 3/6] Update `Cargo.toml` to reference correct `crate/resource_rt` path. --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 96f693db8..7082a9a45 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ peace_diff = { workspace = true } peace_flow_model = { workspace = true } peace_fmt = { workspace = true } peace_params = { workspace = true } -peace_resources_rt = { workspace = true } +peace_resource_rt = { workspace = true } peace_rt = { workspace = true } peace_rt_model = { workspace = true } peace_webi = { workspace = true, optional = true } @@ -118,7 +118,7 @@ peace_flow_model = { path = "crate/flow_model", version = "0.0.13" } peace_fmt = { path = "crate/fmt", version = "0.0.13" } peace_params = { path = "crate/params", version = "0.0.13" } peace_params_derive = { path = "crate/params_derive", version = "0.0.13" } -peace_resources_rt = { path = "crate/resources_rt", version = "0.0.13" } +peace_resource_rt = { path = "crate/resource_rt", version = "0.0.13" } peace_rt = { path = "crate/rt", version = "0.0.13" } peace_rt_model = { path = "crate/rt_model", version = "0.0.13" } peace_rt_model_core = { path = "crate/rt_model_core", version = "0.0.13" } From fb1a95cf50af0cfda83e7c0dc08fc6bb9e8aca07 Mon Sep 17 00:00:00 2001 From: Azriel Hoh Date: Mon, 3 Jun 2024 11:50:50 +1200 Subject: [PATCH 4/6] Run `cargo fmt --all`. --- crate/core/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crate/core/src/lib.rs b/crate/core/src/lib.rs index b0cc82688..fe1cc0cdf 100644 --- a/crate/core/src/lib.rs +++ b/crate/core/src/lib.rs @@ -4,8 +4,8 @@ //! //! * `peace_cfg` has a dependency on `peace_resource_rt` for `Resources`, used //! in `Item::setup`. -//! * `peace_resource_rt` has a dependency on `ItemId`, as uses -//! `TypeMap` for the `States` maps. +//! * `peace_resource_rt` has a dependency on `ItemId`, as uses `TypeMap` for the `States` maps. //! //! When [peace#67] is implemented, the `progress` module can be moved out //! of `peace_core` into `peace_cfg`. From e0f599f247486dac7fb95e3b252398c215b64053 Mon Sep 17 00:00:00 2001 From: Azriel Hoh Date: Mon, 3 Jun 2024 11:53:41 +1200 Subject: [PATCH 5/6] Update `resource_rt` export and imports. --- crate/params_derive/src/lib.rs | 7 ++++++- doc/src/licenses.html | 2 +- doc/src/technical_concepts/resources.md | 4 ++-- doc/src/technical_concepts/workspace.md | 2 +- examples/envman/src/cmds/env_diff_cmd.rs | 2 +- .../items/peace_aws_iam_policy/iam_policy_item.rs | 2 +- .../src/items/peace_aws_iam_role/iam_role_item.rs | 2 +- .../instance_profile_item.rs | 2 +- .../src/items/peace_aws_s3_bucket/s3_bucket_item.rs | 2 +- .../src/items/peace_aws_s3_object/s3_object_item.rs | 2 +- examples/envman/src/output.rs | 2 +- items/blank/src/blank_item.rs | 2 +- items/file_download/src/file_download_item.rs | 2 +- items/sh_cmd/src/sh_cmd_item.rs | 2 +- items/tar_x/src/tar_x_item.rs | 2 +- src/lib.rs | 2 +- workspace_tests/src/cfg/stored.rs | 6 +++--- workspace_tests/src/cli/output/cli_output.rs | 2 +- .../cmd_ctx_builder/multi_profile_no_flow_builder.rs | 2 +- .../multi_profile_single_flow_builder.rs | 2 +- .../single_profile_no_flow_builder.rs | 2 +- .../single_profile_single_flow_builder.rs | 2 +- workspace_tests/src/cmd_rt/cmd_execution.rs | 2 +- .../cmd_execution/cmd_execution_error_builder.rs | 6 +++--- workspace_tests/src/items/tar_x_item.rs | 2 +- workspace_tests/src/mock_item.rs | 2 +- workspace_tests/src/params/any_spec_rt_boxed.rs | 2 +- workspace_tests/src/params/derive.rs | 12 ++++++------ workspace_tests/src/params/mapping_fn_impl.rs | 2 +- workspace_tests/src/params/params_spec.rs | 2 +- workspace_tests/src/params/params_spec_fieldless.rs | 2 +- workspace_tests/src/params/value_spec.rs | 2 +- workspace_tests/src/resource_rt/dir/peace_dir.rs | 2 +- workspace_tests/src/resource_rt/dir/profile_dir.rs | 2 +- .../src/resource_rt/dir/profile_history_dir.rs | 2 +- .../src/resource_rt/dir/states_current_file.rs | 2 +- .../src/resource_rt/dir/states_goal_file.rs | 2 +- workspace_tests/src/resource_rt/dir/workspace_dir.rs | 2 +- .../src/resource_rt/internal/flow_params_file.rs | 2 +- .../src/resource_rt/internal/profile_params_file.rs | 2 +- .../src/resource_rt/internal/state_diffs_mut.rs | 2 +- .../src/resource_rt/internal/states_mut.rs | 4 ++-- .../src/resource_rt/internal/workspace_dirs.rs | 2 +- .../resource_rt/internal/workspace_params_file.rs | 2 +- workspace_tests/src/resource_rt/resources.rs | 4 ++-- workspace_tests/src/resource_rt/resources/ts.rs | 2 +- workspace_tests/src/resource_rt/state_diffs.rs | 2 +- workspace_tests/src/resource_rt/states.rs | 4 ++-- .../src/resource_rt/states/states_cleaned.rs | 2 +- .../src/resource_rt/states/states_cleaned_dry.rs | 2 +- .../src/resource_rt/states/states_current.rs | 2 +- .../src/resource_rt/states/states_current_stored.rs | 2 +- .../src/resource_rt/states/states_ensured.rs | 2 +- .../src/resource_rt/states/states_ensured_dry.rs | 2 +- .../src/resource_rt/states/states_goal.rs | 2 +- .../src/resource_rt/states/states_goal_stored.rs | 2 +- .../src/resource_rt/states/states_previous.rs | 2 +- workspace_tests/src/resource_rt/states/ts.rs | 4 ++-- .../src/rt/cmd_blocks/apply_exec_cmd_block.rs | 2 +- workspace_tests/src/rt/cmd_blocks/diff_cmd_block.rs | 2 +- workspace_tests/src/rt/cmds/clean_cmd.rs | 2 +- workspace_tests/src/rt/cmds/diff_cmd.rs | 2 +- workspace_tests/src/rt/cmds/ensure_cmd.rs | 2 +- workspace_tests/src/rt/cmds/states_discover_cmd.rs | 2 +- workspace_tests/src/rt_model/item_graph.rs | 2 +- workspace_tests/src/rt_model/item_wrapper.rs | 2 +- workspace_tests/src/rt_model/outcomes/item_apply.rs | 2 +- .../src/rt_model/outcomes/item_apply_boxed.rs | 2 +- .../src/rt_model/outcomes/item_apply_partial.rs | 2 +- .../rt_model/outcomes/item_apply_partial_boxed.rs | 2 +- .../src/rt_model/outcomes/item_apply_partial_rt.rs | 2 +- .../src/rt_model/outcomes/item_apply_rt.rs | 2 +- workspace_tests/src/rt_model/states_serializer.rs | 2 +- workspace_tests/src/rt_model/storage.rs | 2 +- workspace_tests/src/test_support.rs | 2 +- workspace_tests/src/vec_copy_item.rs | 2 +- 76 files changed, 95 insertions(+), 90 deletions(-) diff --git a/crate/params_derive/src/lib.rs b/crate/params_derive/src/lib.rs index 39aa7d4b1..06c924d8d 100644 --- a/crate/params_derive/src/lib.rs +++ b/crate/params_derive/src/lib.rs @@ -153,7 +153,12 @@ fn impl_value(ast: &mut DeriveInput, impl_mode: ImplMode) -> proc_macro2::TokenS None } }) - .unwrap_or_else(|| (parse_quote!(peace::params), parse_quote!(peace::resources))); + .unwrap_or_else(|| { + ( + parse_quote!(peace::params), + parse_quote!(peace::resource_rt), + ) + }); type_parameters_constrain(ast); let value_name = &ast.ident; diff --git a/doc/src/licenses.html b/doc/src/licenses.html index 7f51b4b0b..c142db7c0 100644 --- a/doc/src/licenses.html +++ b/doc/src/licenses.html @@ -9089,7 +9089,7 @@

Used by:

  • peace_fmt 0.0.13
  • peace_params 0.0.13
  • peace_params_derive 0.0.13
    • -
  • peace_resources_rt 0.0.13
    • +
  • peace_resource_rt 0.0.13
  • peace_rt 0.0.13
  • peace_rt_model 0.0.13
  • peace_rt_model_core 0.0.13
    • diff --git a/doc/src/technical_concepts/resources.md b/doc/src/technical_concepts/resources.md index 28091ec13..a85151312 100644 --- a/doc/src/technical_concepts/resources.md +++ b/doc/src/technical_concepts/resources.md @@ -12,7 +12,7 @@ Example of an any-map: ```rust ,edition2021,ignore -# use peace::resources::Resources; +# use peace::resource_rt::Resources; # let mut resources = Resources::new(); resources.insert(1u32); @@ -56,5 +56,5 @@ aLong = 3L; Rust's does not allow access to multiple mutable entries at the same time with the built in `HashMap`, so `Resources` is an implementation to bypass the compilation strictness. -[`Resources`]: https://docs.rs/peace_resources_rt/latest/peace_resources_rt/struct.Resources.html +[`Resources`]: https://docs.rs/peace_resource_rt/latest/peace_resource_rt/struct.Resources.html [`resman`]: https://github.com/azriel91/resman diff --git a/doc/src/technical_concepts/workspace.md b/doc/src/technical_concepts/workspace.md index 83e6dbb61..417b92e4e 100644 --- a/doc/src/technical_concepts/workspace.md +++ b/doc/src/technical_concepts/workspace.md @@ -200,4 +200,4 @@ path/to/repo ``` -[workspace directory]: https://docs.rs/peace_resources_rt/latest/peace_resources_rt/paths/struct.WorkspaceDir.html +[workspace directory]: https://docs.rs/peace_resource_rt/latest/peace_resource_rt/paths/struct.WorkspaceDir.html diff --git a/examples/envman/src/cmds/env_diff_cmd.rs b/examples/envman/src/cmds/env_diff_cmd.rs index a43e912ca..7a1fb3e8e 100644 --- a/examples/envman/src/cmds/env_diff_cmd.rs +++ b/examples/envman/src/cmds/env_diff_cmd.rs @@ -9,7 +9,7 @@ use peace::{ presentable::{Heading, HeadingLevel, ListNumberedAligned}, PresentableExt, }, - resources::states::StateDiffs, + resource_rt::states::StateDiffs, rt::cmds::DiffCmd, rt_model::{output::OutputWrite, Flow}, }; diff --git a/examples/envman/src/items/peace_aws_iam_policy/iam_policy_item.rs b/examples/envman/src/items/peace_aws_iam_policy/iam_policy_item.rs index 147b98da8..ed1c79255 100644 --- a/examples/envman/src/items/peace_aws_iam_policy/iam_policy_item.rs +++ b/examples/envman/src/items/peace_aws_iam_policy/iam_policy_item.rs @@ -4,7 +4,7 @@ use aws_config::BehaviorVersion; use peace::{ cfg::{async_trait, ApplyCheck, FnCtx, Item, ItemId}, params::Params, - resources::{resources::ts::Empty, Resources}, + resource_rt::{resources::ts::Empty, Resources}, }; use crate::items::peace_aws_iam_policy::{ diff --git a/examples/envman/src/items/peace_aws_iam_role/iam_role_item.rs b/examples/envman/src/items/peace_aws_iam_role/iam_role_item.rs index 976bcfab7..0c36183e6 100644 --- a/examples/envman/src/items/peace_aws_iam_role/iam_role_item.rs +++ b/examples/envman/src/items/peace_aws_iam_role/iam_role_item.rs @@ -4,7 +4,7 @@ use aws_config::BehaviorVersion; use peace::{ cfg::{async_trait, ApplyCheck, FnCtx, Item, ItemId}, params::Params, - resources::{resources::ts::Empty, Resources}, + resource_rt::{resources::ts::Empty, Resources}, }; use crate::items::peace_aws_iam_role::{ diff --git a/examples/envman/src/items/peace_aws_instance_profile/instance_profile_item.rs b/examples/envman/src/items/peace_aws_instance_profile/instance_profile_item.rs index 5f03ab917..32d9a5282 100644 --- a/examples/envman/src/items/peace_aws_instance_profile/instance_profile_item.rs +++ b/examples/envman/src/items/peace_aws_instance_profile/instance_profile_item.rs @@ -4,7 +4,7 @@ use aws_config::BehaviorVersion; use peace::{ cfg::{async_trait, ApplyCheck, FnCtx, Item, ItemId}, params::Params, - resources::{resources::ts::Empty, Resources}, + resource_rt::{resources::ts::Empty, Resources}, }; use crate::items::peace_aws_instance_profile::{ diff --git a/examples/envman/src/items/peace_aws_s3_bucket/s3_bucket_item.rs b/examples/envman/src/items/peace_aws_s3_bucket/s3_bucket_item.rs index 337a05fea..07de489f9 100644 --- a/examples/envman/src/items/peace_aws_s3_bucket/s3_bucket_item.rs +++ b/examples/envman/src/items/peace_aws_s3_bucket/s3_bucket_item.rs @@ -4,7 +4,7 @@ use aws_config::BehaviorVersion; use peace::{ cfg::{async_trait, ApplyCheck, FnCtx, Item, ItemId}, params::Params, - resources::{resources::ts::Empty, Resources}, + resource_rt::{resources::ts::Empty, Resources}, }; use crate::items::peace_aws_s3_bucket::{ diff --git a/examples/envman/src/items/peace_aws_s3_object/s3_object_item.rs b/examples/envman/src/items/peace_aws_s3_object/s3_object_item.rs index 66a41ae4b..324b665c7 100644 --- a/examples/envman/src/items/peace_aws_s3_object/s3_object_item.rs +++ b/examples/envman/src/items/peace_aws_s3_object/s3_object_item.rs @@ -4,7 +4,7 @@ use aws_config::BehaviorVersion; use peace::{ cfg::{async_trait, ApplyCheck, FnCtx, Item, ItemId}, params::Params, - resources::{resources::ts::Empty, Resources}, + resource_rt::{resources::ts::Empty, Resources}, }; use crate::items::peace_aws_s3_object::{ diff --git a/examples/envman/src/output.rs b/examples/envman/src/output.rs index 0f0580fdc..5526cb900 100644 --- a/examples/envman/src/output.rs +++ b/examples/envman/src/output.rs @@ -5,7 +5,7 @@ use peace::{ presentable::{Heading, HeadingLevel}, presentln, }, - resources::{resources::ts::SetUp, Resources}, + resource_rt::{resources::ts::SetUp, Resources}, rt_model::{output::OutputWrite, IndexMap}, }; diff --git a/items/blank/src/blank_item.rs b/items/blank/src/blank_item.rs index 27d545860..7fd4d2d1d 100644 --- a/items/blank/src/blank_item.rs +++ b/items/blank/src/blank_item.rs @@ -3,7 +3,7 @@ use std::marker::PhantomData; use peace::{ cfg::{async_trait, ApplyCheck, FnCtx, Item, ItemId}, params::Params, - resources::{resources::ts::Empty, Resources}, + resource_rt::{resources::ts::Empty, Resources}, }; use crate::{BlankApplyFns, BlankData, BlankError, BlankParams, BlankState, BlankStateDiff}; diff --git a/items/file_download/src/file_download_item.rs b/items/file_download/src/file_download_item.rs index 111fa97d1..87e9d2f11 100644 --- a/items/file_download/src/file_download_item.rs +++ b/items/file_download/src/file_download_item.rs @@ -3,7 +3,7 @@ use std::{marker::PhantomData, path::Path}; use peace::{ cfg::{async_trait, state::FetchedOpt, ApplyCheck, FnCtx, Item, ItemId, State}, params::Params, - resources::{resources::ts::Empty, Resources}, + resource_rt::{resources::ts::Empty, Resources}, }; use crate::{ diff --git a/items/sh_cmd/src/sh_cmd_item.rs b/items/sh_cmd/src/sh_cmd_item.rs index 30dd86e04..2cca486e2 100644 --- a/items/sh_cmd/src/sh_cmd_item.rs +++ b/items/sh_cmd/src/sh_cmd_item.rs @@ -3,7 +3,7 @@ use std::marker::PhantomData; use peace::{ cfg::{async_trait, ApplyCheck, FnCtx, Item, ItemId, State}, params::Params, - resources::{resources::ts::Empty, Resources}, + resource_rt::{resources::ts::Empty, Resources}, }; use crate::{ diff --git a/items/tar_x/src/tar_x_item.rs b/items/tar_x/src/tar_x_item.rs index 6097e10ba..cd6681e98 100644 --- a/items/tar_x/src/tar_x_item.rs +++ b/items/tar_x/src/tar_x_item.rs @@ -3,7 +3,7 @@ use std::marker::PhantomData; use peace::{ cfg::{async_trait, ApplyCheck, FnCtx, Item, ItemId}, params::Params, - resources::{resources::ts::Empty, Resources}, + resource_rt::{resources::ts::Empty, Resources}, }; use crate::{ diff --git a/src/lib.rs b/src/lib.rs index f216536ca..45ca5bc1e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -17,7 +17,7 @@ pub use peace_diff as diff; pub use peace_flow_model as flow_model; pub use peace_fmt as fmt; pub use peace_params as params; -pub use peace_resources_rt as resources; +pub use peace_resource_rt as resource_rt; pub use peace_rt as rt; pub use peace_rt_model as rt_model; #[cfg(feature = "webi")] diff --git a/workspace_tests/src/cfg/stored.rs b/workspace_tests/src/cfg/stored.rs index af037ca79..551046ebd 100644 --- a/workspace_tests/src/cfg/stored.rs +++ b/workspace_tests/src/cfg/stored.rs @@ -3,7 +3,7 @@ use std::any::TypeId; use peace::{ cfg::{accessors::Stored, item_id, ItemId}, data::{fn_graph::Resources, Data, DataAccess, DataAccessDyn, TypeIds}, - resources::{internal::StatesMut, states::StatesCurrentStored}, + resource_rt::{internal::StatesMut, states::StatesCurrentStored}, }; const ITEM_SPEC_ID_TEST: &ItemId = &item_id!("item_id_test"); @@ -100,13 +100,13 @@ fn debug() { let stored = Stored::<'_, u8>::borrow(ITEM_SPEC_ID_TEST, &resources); assert_eq!( - r#"Stored { item_id: ItemId("item_id_test"), states_current_stored: Some(Ref { inner: States({ItemId("item_id_test"): TypedValue { type: "u8", value: 123 }}, PhantomData) }), marker: PhantomData }"#, + r#"Stored { item_id: ItemId("item_id_test"), states_current_stored: Some(Ref { inner: States({ItemId("item_id_test"): TypedValue { type: "u8", value: 123 }}, PhantomData) }), marker: PhantomData }"#, format!("{stored:?}") ); let stored = Stored::<'_, u8>::borrow(ITEM_SPEC_ID_OTHER, &resources); assert_eq!( - r#"Stored { item_id: ItemId("item_id_other"), states_current_stored: Some(Ref { inner: States({ItemId("item_id_test"): TypedValue { type: "u8", value: 123 }}, PhantomData) }), marker: PhantomData }"#, + r#"Stored { item_id: ItemId("item_id_other"), states_current_stored: Some(Ref { inner: States({ItemId("item_id_test"): TypedValue { type: "u8", value: 123 }}, PhantomData) }), marker: PhantomData }"#, format!("{stored:?}") ); } diff --git a/workspace_tests/src/cli/output/cli_output.rs b/workspace_tests/src/cli/output/cli_output.rs index 2b1ef0455..a824b0988 100644 --- a/workspace_tests/src/cli/output/cli_output.rs +++ b/workspace_tests/src/cli/output/cli_output.rs @@ -2,7 +2,7 @@ use peace::{ cfg::{item_id, State}, cli::output::{CliColorizeOpt, CliOutput, CliOutputBuilder}, cli_model::OutputFormat, - resources::{ + resource_rt::{ internal::{StateDiffsMut, StatesMut}, states::{StateDiffs, StatesCurrentStored}, }, diff --git a/workspace_tests/src/cmd/ctx/cmd_ctx_builder/multi_profile_no_flow_builder.rs b/workspace_tests/src/cmd/ctx/cmd_ctx_builder/multi_profile_no_flow_builder.rs index cbf2c2b1e..5fc21623f 100644 --- a/workspace_tests/src/cmd/ctx/cmd_ctx_builder/multi_profile_no_flow_builder.rs +++ b/workspace_tests/src/cmd/ctx/cmd_ctx_builder/multi_profile_no_flow_builder.rs @@ -3,7 +3,7 @@ use std::collections::BTreeMap; use peace::{ cfg::{app_name, profile, Profile, ProfileInvalidFmt}, cmd::ctx::CmdCtx, - resources::paths::{ProfileDir, ProfileHistoryDir}, + resource_rt::paths::{ProfileDir, ProfileHistoryDir}, rt_model::{params::ParamsTypeRegs, Error as PeaceRtError, NativeError}, }; diff --git a/workspace_tests/src/cmd/ctx/cmd_ctx_builder/multi_profile_single_flow_builder.rs b/workspace_tests/src/cmd/ctx/cmd_ctx_builder/multi_profile_single_flow_builder.rs index 50beaabdd..e5a8b9c7c 100644 --- a/workspace_tests/src/cmd/ctx/cmd_ctx_builder/multi_profile_single_flow_builder.rs +++ b/workspace_tests/src/cmd/ctx/cmd_ctx_builder/multi_profile_single_flow_builder.rs @@ -3,7 +3,7 @@ use std::collections::BTreeMap; use peace::{ cfg::{app_name, flow_id, profile}, cmd::ctx::CmdCtx, - resources::paths::{FlowDir, ProfileDir, ProfileHistoryDir}, + resource_rt::paths::{FlowDir, ProfileDir, ProfileHistoryDir}, rt_model::{params::ParamsTypeRegs, Flow, ItemGraphBuilder, ParamsSpecsTypeReg, StatesTypeReg}, }; diff --git a/workspace_tests/src/cmd/ctx/cmd_ctx_builder/single_profile_no_flow_builder.rs b/workspace_tests/src/cmd/ctx/cmd_ctx_builder/single_profile_no_flow_builder.rs index 690266fd1..67890f55a 100644 --- a/workspace_tests/src/cmd/ctx/cmd_ctx_builder/single_profile_no_flow_builder.rs +++ b/workspace_tests/src/cmd/ctx/cmd_ctx_builder/single_profile_no_flow_builder.rs @@ -1,7 +1,7 @@ use peace::{ cfg::{app_name, profile}, cmd::ctx::CmdCtx, - resources::paths::{ProfileDir, ProfileHistoryDir}, + resource_rt::paths::{ProfileDir, ProfileHistoryDir}, }; use crate::{no_op_output::NoOpOutput, test_support::workspace, PeaceTestError}; diff --git a/workspace_tests/src/cmd/ctx/cmd_ctx_builder/single_profile_single_flow_builder.rs b/workspace_tests/src/cmd/ctx/cmd_ctx_builder/single_profile_single_flow_builder.rs index 8447384de..32fba8ca6 100644 --- a/workspace_tests/src/cmd/ctx/cmd_ctx_builder/single_profile_single_flow_builder.rs +++ b/workspace_tests/src/cmd/ctx/cmd_ctx_builder/single_profile_single_flow_builder.rs @@ -2,7 +2,7 @@ use peace::{ cfg::{app_name, flow_id, item_id, profile, Item, Profile}, cmd::ctx::CmdCtx, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, - resources::{ + resource_rt::{ paths::{FlowDir, ProfileDir, ProfileHistoryDir}, type_reg::untagged::BoxDataTypeDowncast, }, diff --git a/workspace_tests/src/cmd_rt/cmd_execution.rs b/workspace_tests/src/cmd_rt/cmd_execution.rs index 02ddf2b30..ff9b479f5 100644 --- a/workspace_tests/src/cmd_rt/cmd_execution.rs +++ b/workspace_tests/src/cmd_rt/cmd_execution.rs @@ -3,7 +3,7 @@ use peace::{ cmd::ctx::CmdCtx, cmd_model::CmdOutcome, cmd_rt::{CmdBlockRt, CmdBlockWrapper, CmdExecution}, - resources::states::{ + resource_rt::states::{ ts::{Current, Goal}, StateDiffs, StatesCurrent, }, diff --git a/workspace_tests/src/cmd_rt/cmd_execution/cmd_execution_error_builder.rs b/workspace_tests/src/cmd_rt/cmd_execution/cmd_execution_error_builder.rs index 5d35bbe0d..f499d96ab 100644 --- a/workspace_tests/src/cmd_rt/cmd_execution/cmd_execution_error_builder.rs +++ b/workspace_tests/src/cmd_rt/cmd_execution/cmd_execution_error_builder.rs @@ -3,7 +3,7 @@ use peace::{ cmd::ctx::CmdCtx, cmd_model::CmdExecutionError, cmd_rt::{CmdBlockWrapper, CmdExecution}, - resources::states::{ + resource_rt::states::{ ts::{Current, Goal}, StateDiffs, }, @@ -71,7 +71,7 @@ async fn builds_error_for_missing_input_tuple_first_parameter() -> Result<(), Pe assert_eq!(1, cmd_block_index); assert_eq!("States", input_name_short); assert_eq!( - "peace_resources_rt::states::States", + "peace_resource_rt::states::States", input_name_full ); #[cfg(feature = "error_reporting")] @@ -160,7 +160,7 @@ async fn builds_error_for_missing_input_tuple_second_parameter() -> Result<(), P assert_eq!(1, cmd_block_index); assert_eq!("States", input_name_short); assert_eq!( - "peace_resources_rt::states::States", + "peace_resource_rt::states::States", input_name_full ); #[cfg(feature = "error_reporting")] diff --git a/workspace_tests/src/items/tar_x_item.rs b/workspace_tests/src/items/tar_x_item.rs index 9816e9b6e..c7649380e 100644 --- a/workspace_tests/src/items/tar_x_item.rs +++ b/workspace_tests/src/items/tar_x_item.rs @@ -6,7 +6,7 @@ use peace::{ cmd_model::CmdOutcome, data::Data, params::{ParamsSpec, ValueResolutionCtx, ValueResolutionMode}, - resources::paths::{FlowDir, ProfileDir}, + resource_rt::paths::{FlowDir, ProfileDir}, rt::cmds::{CleanCmd, DiffCmd, EnsureCmd, StatesDiscoverCmd}, rt_model::{Flow, InMemoryTextOutput, ItemGraph, ItemGraphBuilder, Workspace, WorkspaceSpec}, }; diff --git a/workspace_tests/src/mock_item.rs b/workspace_tests/src/mock_item.rs index 2644b9828..af0668ca4 100644 --- a/workspace_tests/src/mock_item.rs +++ b/workspace_tests/src/mock_item.rs @@ -14,7 +14,7 @@ use peace::{ Data, }, params::Params, - resources::{resources::ts::Empty, states::StatesCurrentStored, Resources}, + resource_rt::{resources::ts::Empty, states::StatesCurrentStored, Resources}, }; use serde::{Deserialize, Serialize}; diff --git a/workspace_tests/src/params/any_spec_rt_boxed.rs b/workspace_tests/src/params/any_spec_rt_boxed.rs index 88116df8b..0684c551a 100644 --- a/workspace_tests/src/params/any_spec_rt_boxed.rs +++ b/workspace_tests/src/params/any_spec_rt_boxed.rs @@ -2,7 +2,7 @@ use std::any::TypeId; use peace::{ params::{AnySpecDataType, AnySpecRtBoxed, ParamsSpec}, - resources::type_reg::untagged::{BoxDataTypeDowncast, DataType, DataTypeWrapper}, + resource_rt::type_reg::untagged::{BoxDataTypeDowncast, DataType, DataTypeWrapper}, }; use crate::mock_item::MockSrc; diff --git a/workspace_tests/src/params/derive.rs b/workspace_tests/src/params/derive.rs index 830f1efc4..6f12cbec4 100644 --- a/workspace_tests/src/params/derive.rs +++ b/workspace_tests/src/params/derive.rs @@ -72,7 +72,7 @@ mod struct_params { use peace::{ cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, - resources::{resources::ts::SetUp, Resources}, + resource_rt::{resources::ts::SetUp, Resources}, }; #[derive(Clone, Debug, Params, Serialize, Deserialize)] @@ -271,7 +271,7 @@ mod struct_with_type_params { use peace::{ cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, - resources::{resources::ts::SetUp, Resources}, + resource_rt::{resources::ts::SetUp, Resources}, }; #[derive(Derivative, Params, Serialize, Deserialize)] @@ -491,7 +491,7 @@ mod tuple_params { use peace::{ cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, - resources::{resources::ts::SetUp, Resources}, + resource_rt::{resources::ts::SetUp, Resources}, }; #[derive(Clone, Debug, Params, Serialize, Deserialize)] @@ -667,7 +667,7 @@ mod tuple_with_type_params { use peace::{ cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, - resources::{resources::ts::SetUp, Resources}, + resource_rt::{resources::ts::SetUp, Resources}, }; #[derive(Clone, Debug, Params, Serialize, Deserialize)] @@ -868,7 +868,7 @@ mod enum_params { use peace::{ cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, - resources::{resources::ts::SetUp, Resources}, + resource_rt::{resources::ts::SetUp, Resources}, }; #[derive(Derivative, Params, Serialize, Deserialize)] @@ -1501,7 +1501,7 @@ mod struct_recursive_value { use peace::{ cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, - resources::{resources::ts::SetUp, Resources}, + resource_rt::{resources::ts::SetUp, Resources}, }; #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] diff --git a/workspace_tests/src/params/mapping_fn_impl.rs b/workspace_tests/src/params/mapping_fn_impl.rs index ad7df3c0e..8ac55ddf2 100644 --- a/workspace_tests/src/params/mapping_fn_impl.rs +++ b/workspace_tests/src/params/mapping_fn_impl.rs @@ -46,7 +46,7 @@ macro_rules! mapping_tests { MappingFn, MappingFnImpl, ParamsResolveError, ValueResolutionCtx, ValueResolutionMode, }, - resources::{resources::ts::SetUp, Resources}, + resource_rt::{resources::ts::SetUp, Resources}, }; #[test] diff --git a/workspace_tests/src/params/params_spec.rs b/workspace_tests/src/params/params_spec.rs index 814632c5d..87894f9ba 100644 --- a/workspace_tests/src/params/params_spec.rs +++ b/workspace_tests/src/params/params_spec.rs @@ -4,7 +4,7 @@ use peace::{ AnySpecRt, AnySpecRtBoxed, FieldNameAndType, FieldWiseSpecRt, Params, ParamsResolveError, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec, ValueSpecRt, }, - resources::{resources::ts::SetUp, Resources}, + resource_rt::{resources::ts::SetUp, Resources}, }; use crate::{ diff --git a/workspace_tests/src/params/params_spec_fieldless.rs b/workspace_tests/src/params/params_spec_fieldless.rs index 7d0cc66f5..25f09b09f 100644 --- a/workspace_tests/src/params/params_spec_fieldless.rs +++ b/workspace_tests/src/params/params_spec_fieldless.rs @@ -4,7 +4,7 @@ use peace::{ AnySpecRt, AnySpecRtBoxed, ParamsFieldless, ParamsResolveError, ParamsSpecFieldless, ValueResolutionCtx, ValueResolutionMode, ValueSpecRt, }, - resources::{resources::ts::SetUp, Resources}, + resource_rt::{resources::ts::SetUp, Resources}, }; use crate::mock_item::MockSrc; diff --git a/workspace_tests/src/params/value_spec.rs b/workspace_tests/src/params/value_spec.rs index e73cfa04b..9dcca5c23 100644 --- a/workspace_tests/src/params/value_spec.rs +++ b/workspace_tests/src/params/value_spec.rs @@ -4,7 +4,7 @@ use peace::{ AnySpecRt, AnySpecRtBoxed, ParamsResolveError, ValueResolutionCtx, ValueResolutionMode, ValueSpec, ValueSpecRt, }, - resources::{resources::ts::SetUp, Resources}, + resource_rt::{resources::ts::SetUp, Resources}, }; use crate::mock_item::MockSrc; diff --git a/workspace_tests/src/resource_rt/dir/peace_dir.rs b/workspace_tests/src/resource_rt/dir/peace_dir.rs index 6079b5f24..e58b63f02 100644 --- a/workspace_tests/src/resource_rt/dir/peace_dir.rs +++ b/workspace_tests/src/resource_rt/dir/peace_dir.rs @@ -1,6 +1,6 @@ use std::{ffi::OsStr, path::Path}; -use peace::resources::paths::{PeaceDir, WorkspaceDir}; +use peace::resource_rt::paths::{PeaceDir, WorkspaceDir}; #[test] pub fn debug() { diff --git a/workspace_tests/src/resource_rt/dir/profile_dir.rs b/workspace_tests/src/resource_rt/dir/profile_dir.rs index 177346ef7..366e55b79 100644 --- a/workspace_tests/src/resource_rt/dir/profile_dir.rs +++ b/workspace_tests/src/resource_rt/dir/profile_dir.rs @@ -2,7 +2,7 @@ use std::{ffi::OsStr, path::Path}; use peace::{ cfg::{app_name, profile}, - resources::paths::{PeaceAppDir, PeaceDir, ProfileDir}, + resource_rt::paths::{PeaceAppDir, PeaceDir, ProfileDir}, }; #[test] diff --git a/workspace_tests/src/resource_rt/dir/profile_history_dir.rs b/workspace_tests/src/resource_rt/dir/profile_history_dir.rs index ea8b5900f..a2d8d0c6b 100644 --- a/workspace_tests/src/resource_rt/dir/profile_history_dir.rs +++ b/workspace_tests/src/resource_rt/dir/profile_history_dir.rs @@ -2,7 +2,7 @@ use std::{ffi::OsStr, path::Path}; use peace::{ cfg::{app_name, profile}, - resources::paths::{PeaceAppDir, PeaceDir, ProfileDir, ProfileHistoryDir}, + resource_rt::paths::{PeaceAppDir, PeaceDir, ProfileDir, ProfileHistoryDir}, }; #[test] diff --git a/workspace_tests/src/resource_rt/dir/states_current_file.rs b/workspace_tests/src/resource_rt/dir/states_current_file.rs index e5446c1b6..d8d4d60b3 100644 --- a/workspace_tests/src/resource_rt/dir/states_current_file.rs +++ b/workspace_tests/src/resource_rt/dir/states_current_file.rs @@ -5,7 +5,7 @@ use std::{ use peace::{ cfg::{app_name, flow_id, profile}, - resources::paths::{FlowDir, PeaceAppDir, PeaceDir, ProfileDir, StatesCurrentFile}, + resource_rt::paths::{FlowDir, PeaceAppDir, PeaceDir, ProfileDir, StatesCurrentFile}, }; #[test] diff --git a/workspace_tests/src/resource_rt/dir/states_goal_file.rs b/workspace_tests/src/resource_rt/dir/states_goal_file.rs index 4a1a8c7ea..dea60dfae 100644 --- a/workspace_tests/src/resource_rt/dir/states_goal_file.rs +++ b/workspace_tests/src/resource_rt/dir/states_goal_file.rs @@ -5,7 +5,7 @@ use std::{ use peace::{ cfg::{app_name, flow_id, profile}, - resources::paths::{FlowDir, PeaceAppDir, PeaceDir, ProfileDir, StatesGoalFile}, + resource_rt::paths::{FlowDir, PeaceAppDir, PeaceDir, ProfileDir, StatesGoalFile}, }; #[test] diff --git a/workspace_tests/src/resource_rt/dir/workspace_dir.rs b/workspace_tests/src/resource_rt/dir/workspace_dir.rs index 0a808a2b5..078e5f630 100644 --- a/workspace_tests/src/resource_rt/dir/workspace_dir.rs +++ b/workspace_tests/src/resource_rt/dir/workspace_dir.rs @@ -1,6 +1,6 @@ use std::{ffi::OsStr, path::Path}; -use peace::resources::paths::WorkspaceDir; +use peace::resource_rt::paths::WorkspaceDir; #[test] pub fn debug() { diff --git a/workspace_tests/src/resource_rt/internal/flow_params_file.rs b/workspace_tests/src/resource_rt/internal/flow_params_file.rs index fe109df06..916d0b2ee 100644 --- a/workspace_tests/src/resource_rt/internal/flow_params_file.rs +++ b/workspace_tests/src/resource_rt/internal/flow_params_file.rs @@ -5,7 +5,7 @@ use std::{ use peace::{ cfg::{app_name, flow_id, profile}, - resources::{ + resource_rt::{ internal::FlowParamsFile, paths::{FlowDir, PeaceAppDir, PeaceDir, ProfileDir}, }, diff --git a/workspace_tests/src/resource_rt/internal/profile_params_file.rs b/workspace_tests/src/resource_rt/internal/profile_params_file.rs index 80c98f6f2..b31d8e471 100644 --- a/workspace_tests/src/resource_rt/internal/profile_params_file.rs +++ b/workspace_tests/src/resource_rt/internal/profile_params_file.rs @@ -5,7 +5,7 @@ use std::{ use peace::{ cfg::{app_name, profile}, - resources::{ + resource_rt::{ internal::ProfileParamsFile, paths::{PeaceAppDir, PeaceDir, ProfileDir}, }, diff --git a/workspace_tests/src/resource_rt/internal/state_diffs_mut.rs b/workspace_tests/src/resource_rt/internal/state_diffs_mut.rs index 69afc8ccf..8fdc1cf14 100644 --- a/workspace_tests/src/resource_rt/internal/state_diffs_mut.rs +++ b/workspace_tests/src/resource_rt/internal/state_diffs_mut.rs @@ -1,6 +1,6 @@ use peace::{ cfg::item_id, - resources::{internal::StateDiffsMut, type_reg::untagged::TypeMap}, + resource_rt::{internal::StateDiffsMut, type_reg::untagged::TypeMap}, }; #[test] diff --git a/workspace_tests/src/resource_rt/internal/states_mut.rs b/workspace_tests/src/resource_rt/internal/states_mut.rs index 15cf87396..f4330d753 100644 --- a/workspace_tests/src/resource_rt/internal/states_mut.rs +++ b/workspace_tests/src/resource_rt/internal/states_mut.rs @@ -1,6 +1,6 @@ use peace::{ cfg::item_id, - resources::{internal::StatesMut, states::ts::Current, type_reg::untagged::TypeMap}, + resource_rt::{internal::StatesMut, states::ts::Current, type_reg::untagged::TypeMap}, }; #[test] @@ -41,7 +41,7 @@ fn debug() { let debug_str = format!("{states:?}"); assert!( debug_str - == r#"StatesMut({ItemId("key"): TypedValue { type: "i32", value: 123 }}, PhantomData)"# + == r#"StatesMut({ItemId("key"): TypedValue { type: "i32", value: 123 }}, PhantomData)"# || debug_str == r#"StatesMut({ItemId("key"): TypedValue { type: "i32", value: 123 }}, PhantomData)"# ); diff --git a/workspace_tests/src/resource_rt/internal/workspace_dirs.rs b/workspace_tests/src/resource_rt/internal/workspace_dirs.rs index 20a422d40..8401051d5 100644 --- a/workspace_tests/src/resource_rt/internal/workspace_dirs.rs +++ b/workspace_tests/src/resource_rt/internal/workspace_dirs.rs @@ -1,6 +1,6 @@ use std::path::PathBuf; -use peace::resources::{ +use peace::resource_rt::{ internal::WorkspaceDirs, paths::{PeaceAppDir, PeaceDir, WorkspaceDir}, }; diff --git a/workspace_tests/src/resource_rt/internal/workspace_params_file.rs b/workspace_tests/src/resource_rt/internal/workspace_params_file.rs index 17d097845..d6757b6cd 100644 --- a/workspace_tests/src/resource_rt/internal/workspace_params_file.rs +++ b/workspace_tests/src/resource_rt/internal/workspace_params_file.rs @@ -5,7 +5,7 @@ use std::{ use peace::{ cfg::app_name, - resources::{ + resource_rt::{ internal::WorkspaceParamsFile, paths::{PeaceAppDir, PeaceDir}, }, diff --git a/workspace_tests/src/resource_rt/resources.rs b/workspace_tests/src/resource_rt/resources.rs index 7df966ff7..3dae3fd38 100644 --- a/workspace_tests/src/resource_rt/resources.rs +++ b/workspace_tests/src/resource_rt/resources.rs @@ -1,6 +1,6 @@ use std::any::{Any, TypeId}; -use peace::resources::{ +use peace::resource_rt::{ resources::ts::{Empty, SetUp}, states::{StatesCurrent, StatesGoal}, Resources, @@ -14,7 +14,7 @@ fn debug() { resources.insert(1u32); assert_eq!( - r#"Resources { inner: {u32: 1}, marker: PhantomData }"#, + r#"Resources { inner: {u32: 1}, marker: PhantomData }"#, format!("{resources:?}") ); } diff --git a/workspace_tests/src/resource_rt/resources/ts.rs b/workspace_tests/src/resource_rt/resources/ts.rs index e699cf1da..27ae6cc75 100644 --- a/workspace_tests/src/resource_rt/resources/ts.rs +++ b/workspace_tests/src/resource_rt/resources/ts.rs @@ -1,5 +1,5 @@ mod debug { - use peace::resources::resources::ts::{Empty, SetUp}; + use peace::resource_rt::resources::ts::{Empty, SetUp}; #[test] fn empty() { diff --git a/workspace_tests/src/resource_rt/state_diffs.rs b/workspace_tests/src/resource_rt/state_diffs.rs index 0d37435ed..814cd1af0 100644 --- a/workspace_tests/src/resource_rt/state_diffs.rs +++ b/workspace_tests/src/resource_rt/state_diffs.rs @@ -1,6 +1,6 @@ use peace::{ cfg::item_id, - resources::{internal::StateDiffsMut, states::StateDiffs, type_reg::untagged::TypeMap}, + resource_rt::{internal::StateDiffsMut, states::StateDiffs, type_reg::untagged::TypeMap}, }; #[test] diff --git a/workspace_tests/src/resource_rt/states.rs b/workspace_tests/src/resource_rt/states.rs index 62cdf1cfb..81feafecc 100644 --- a/workspace_tests/src/resource_rt/states.rs +++ b/workspace_tests/src/resource_rt/states.rs @@ -1,6 +1,6 @@ use peace::{ cfg::item_id, - resources::{internal::StatesMut, states::StatesCurrent, type_reg::untagged::TypeMap}, + resource_rt::{internal::StatesMut, states::StatesCurrent, type_reg::untagged::TypeMap}, }; mod states_cleaned; @@ -59,7 +59,7 @@ fn debug() { let states = test_states(); assert_eq!( - r#"States({ItemId("key"): TypedValue { type: "i32", value: 123 }}, PhantomData)"#, + r#"States({ItemId("key"): TypedValue { type: "i32", value: 123 }}, PhantomData)"#, format!("{states:?}") ); } diff --git a/workspace_tests/src/resource_rt/states/states_cleaned.rs b/workspace_tests/src/resource_rt/states/states_cleaned.rs index 7ad6c4b89..3afc930c0 100644 --- a/workspace_tests/src/resource_rt/states/states_cleaned.rs +++ b/workspace_tests/src/resource_rt/states/states_cleaned.rs @@ -1,4 +1,4 @@ -use peace::resources::states::{StatesCleaned, StatesCurrent}; +use peace::resource_rt::states::{StatesCleaned, StatesCurrent}; #[test] fn from_states_current() { diff --git a/workspace_tests/src/resource_rt/states/states_cleaned_dry.rs b/workspace_tests/src/resource_rt/states/states_cleaned_dry.rs index bc80160e7..84068594c 100644 --- a/workspace_tests/src/resource_rt/states/states_cleaned_dry.rs +++ b/workspace_tests/src/resource_rt/states/states_cleaned_dry.rs @@ -1,4 +1,4 @@ -use peace::resources::states::{StatesCleanedDry, StatesCurrent}; +use peace::resource_rt::states::{StatesCleanedDry, StatesCurrent}; #[test] fn from_states_current() { diff --git a/workspace_tests/src/resource_rt/states/states_current.rs b/workspace_tests/src/resource_rt/states/states_current.rs index 61af6ca58..1f93eafd9 100644 --- a/workspace_tests/src/resource_rt/states/states_current.rs +++ b/workspace_tests/src/resource_rt/states/states_current.rs @@ -1,4 +1,4 @@ -use peace::resources::states::{StatesCurrent, StatesCurrentStored}; +use peace::resource_rt::states::{StatesCurrent, StatesCurrentStored}; #[test] fn from_states_current_stored() { diff --git a/workspace_tests/src/resource_rt/states/states_current_stored.rs b/workspace_tests/src/resource_rt/states/states_current_stored.rs index cf94be9a0..cb1cced8a 100644 --- a/workspace_tests/src/resource_rt/states/states_current_stored.rs +++ b/workspace_tests/src/resource_rt/states/states_current_stored.rs @@ -1,4 +1,4 @@ -use peace::resources::states::{StatesCurrent, StatesCurrentStored}; +use peace::resource_rt::states::{StatesCurrent, StatesCurrentStored}; #[test] fn from_states_current() { diff --git a/workspace_tests/src/resource_rt/states/states_ensured.rs b/workspace_tests/src/resource_rt/states/states_ensured.rs index ab99aaeda..441f2940b 100644 --- a/workspace_tests/src/resource_rt/states/states_ensured.rs +++ b/workspace_tests/src/resource_rt/states/states_ensured.rs @@ -1,4 +1,4 @@ -use peace::resources::states::{StatesCurrent, StatesEnsured}; +use peace::resource_rt::states::{StatesCurrent, StatesEnsured}; #[test] fn from_states_current() { diff --git a/workspace_tests/src/resource_rt/states/states_ensured_dry.rs b/workspace_tests/src/resource_rt/states/states_ensured_dry.rs index 682b9739e..83f0f9d00 100644 --- a/workspace_tests/src/resource_rt/states/states_ensured_dry.rs +++ b/workspace_tests/src/resource_rt/states/states_ensured_dry.rs @@ -1,4 +1,4 @@ -use peace::resources::states::{StatesCurrent, StatesEnsuredDry}; +use peace::resource_rt::states::{StatesCurrent, StatesEnsuredDry}; #[test] fn from_states_current() { diff --git a/workspace_tests/src/resource_rt/states/states_goal.rs b/workspace_tests/src/resource_rt/states/states_goal.rs index b6234aae1..e4ff7c967 100644 --- a/workspace_tests/src/resource_rt/states/states_goal.rs +++ b/workspace_tests/src/resource_rt/states/states_goal.rs @@ -1,4 +1,4 @@ -use peace::resources::states::{StatesGoal, StatesGoalStored}; +use peace::resource_rt::states::{StatesGoal, StatesGoalStored}; #[test] fn from_states_goal_stored() { diff --git a/workspace_tests/src/resource_rt/states/states_goal_stored.rs b/workspace_tests/src/resource_rt/states/states_goal_stored.rs index 27554623f..f0a7e4a87 100644 --- a/workspace_tests/src/resource_rt/states/states_goal_stored.rs +++ b/workspace_tests/src/resource_rt/states/states_goal_stored.rs @@ -1,4 +1,4 @@ -use peace::resources::states::{StatesGoal, StatesGoalStored}; +use peace::resource_rt::states::{StatesGoal, StatesGoalStored}; #[test] fn from_states_goal() { diff --git a/workspace_tests/src/resource_rt/states/states_previous.rs b/workspace_tests/src/resource_rt/states/states_previous.rs index 45e6f7902..5b309e340 100644 --- a/workspace_tests/src/resource_rt/states/states_previous.rs +++ b/workspace_tests/src/resource_rt/states/states_previous.rs @@ -1,4 +1,4 @@ -use peace::resources::states::{StatesCurrent, StatesPrevious}; +use peace::resource_rt::states::{StatesCurrent, StatesPrevious}; #[test] fn from_states_current() { diff --git a/workspace_tests/src/resource_rt/states/ts.rs b/workspace_tests/src/resource_rt/states/ts.rs index 423a06882..a7bab8de0 100644 --- a/workspace_tests/src/resource_rt/states/ts.rs +++ b/workspace_tests/src/resource_rt/states/ts.rs @@ -1,5 +1,5 @@ mod debug { - use peace::resources::states::ts::{ + use peace::resource_rt::states::ts::{ Clean, Cleaned, CleanedDry, Current, CurrentStored, Ensured, EnsuredDry, Goal, GoalStored, Previous, }; @@ -56,7 +56,7 @@ mod debug { } mod serde { - use peace::resources::states::ts::{ + use peace::resource_rt::states::ts::{ Clean, Cleaned, CleanedDry, Current, CurrentStored, Ensured, EnsuredDry, Goal, GoalStored, Previous, }; diff --git a/workspace_tests/src/rt/cmd_blocks/apply_exec_cmd_block.rs b/workspace_tests/src/rt/cmd_blocks/apply_exec_cmd_block.rs index a96cefc96..01b67694c 100644 --- a/workspace_tests/src/rt/cmd_blocks/apply_exec_cmd_block.rs +++ b/workspace_tests/src/rt/cmd_blocks/apply_exec_cmd_block.rs @@ -1,6 +1,6 @@ use peace::{ cmd_rt::CmdBlock, - resources::states::ts::{Cleaned, CleanedDry, Ensured, EnsuredDry}, + resource_rt::states::ts::{Cleaned, CleanedDry, Ensured, EnsuredDry}, rt::cmd_blocks::ApplyExecCmdBlock, }; diff --git a/workspace_tests/src/rt/cmd_blocks/diff_cmd_block.rs b/workspace_tests/src/rt/cmd_blocks/diff_cmd_block.rs index 0be3226cb..7c08b26ce 100644 --- a/workspace_tests/src/rt/cmd_blocks/diff_cmd_block.rs +++ b/workspace_tests/src/rt/cmd_blocks/diff_cmd_block.rs @@ -1,6 +1,6 @@ use peace::{ cmd_rt::CmdBlock, - resources::states::ts::{Current, CurrentStored, Goal, GoalStored}, + resource_rt::states::ts::{Current, CurrentStored, Goal, GoalStored}, rt::cmd_blocks::DiffCmdBlock, }; diff --git a/workspace_tests/src/rt/cmds/clean_cmd.rs b/workspace_tests/src/rt/cmds/clean_cmd.rs index 4fd5d591c..852340c92 100644 --- a/workspace_tests/src/rt/cmds/clean_cmd.rs +++ b/workspace_tests/src/rt/cmds/clean_cmd.rs @@ -2,7 +2,7 @@ use peace::{ cfg::{app_name, profile, FlowId}, cmd::ctx::CmdCtx, cmd_model::CmdOutcome, - resources::type_reg::untagged::BoxDataTypeDowncast, + resource_rt::type_reg::untagged::BoxDataTypeDowncast, rt::cmds::{ ApplyStoredStateSync, CleanCmd, EnsureCmd, StatesCurrentReadCmd, StatesDiscoverCmd, StatesGoalReadCmd, diff --git a/workspace_tests/src/rt/cmds/diff_cmd.rs b/workspace_tests/src/rt/cmds/diff_cmd.rs index 59198ea91..59c6ab3dd 100644 --- a/workspace_tests/src/rt/cmds/diff_cmd.rs +++ b/workspace_tests/src/rt/cmds/diff_cmd.rs @@ -5,7 +5,7 @@ use peace::{ cmd::ctx::CmdCtx, cmd_model::CmdOutcome, params::ParamsSpec, - resources::states::{ + resource_rt::states::{ ts::{Current, CurrentStored, Goal, GoalStored}, StatesCurrent, StatesGoal, }, diff --git a/workspace_tests/src/rt/cmds/ensure_cmd.rs b/workspace_tests/src/rt/cmds/ensure_cmd.rs index a74a587e9..b7648180f 100644 --- a/workspace_tests/src/rt/cmds/ensure_cmd.rs +++ b/workspace_tests/src/rt/cmds/ensure_cmd.rs @@ -5,7 +5,7 @@ use peace::{ interruptible::{InterruptSignal, InterruptStrategy, Interruptibility}, }, cmd_model::{CmdBlockDesc, CmdOutcome}, - resources::{ + resource_rt::{ paths::{StatesCurrentFile, StatesGoalFile}, type_reg::untagged::BoxDataTypeDowncast, }, diff --git a/workspace_tests/src/rt/cmds/states_discover_cmd.rs b/workspace_tests/src/rt/cmds/states_discover_cmd.rs index 4293f1ea7..50c2e132b 100644 --- a/workspace_tests/src/rt/cmds/states_discover_cmd.rs +++ b/workspace_tests/src/rt/cmds/states_discover_cmd.rs @@ -2,7 +2,7 @@ use peace::{ cfg::{app_name, profile, FlowId, ItemId}, cmd::ctx::CmdCtx, cmd_model::CmdOutcome, - resources::{ + resource_rt::{ paths::StatesGoalFile, states::{StatesCurrentStored, StatesGoal}, type_reg::untagged::{BoxDtDisplay, TypeReg}, diff --git a/workspace_tests/src/rt_model/item_graph.rs b/workspace_tests/src/rt_model/item_graph.rs index 3d005bef5..de696dd8c 100644 --- a/workspace_tests/src/rt_model/item_graph.rs +++ b/workspace_tests/src/rt_model/item_graph.rs @@ -1,6 +1,6 @@ use peace::{ cfg::item_id, - resources::{ + resource_rt::{ internal::StatesMut, states::{StatesCurrent, StatesSerde}, }, diff --git a/workspace_tests/src/rt_model/item_wrapper.rs b/workspace_tests/src/rt_model/item_wrapper.rs index 984ed3b03..122aa18dd 100644 --- a/workspace_tests/src/rt_model/item_wrapper.rs +++ b/workspace_tests/src/rt_model/item_wrapper.rs @@ -3,7 +3,7 @@ use peace::{ cfg::{item_id, ApplyCheck, FnCtx}, data::marker::{ApplyDry, Clean, Current, Goal}, params::{ParamsSpec, ParamsSpecs}, - resources::{ + resource_rt::{ internal::StatesMut, resources::ts::SetUp, states::{self, StatesCurrent, StatesCurrentStored, StatesGoal}, diff --git a/workspace_tests/src/rt_model/outcomes/item_apply.rs b/workspace_tests/src/rt_model/outcomes/item_apply.rs index 5b8412cbf..a04ba4a77 100644 --- a/workspace_tests/src/rt_model/outcomes/item_apply.rs +++ b/workspace_tests/src/rt_model/outcomes/item_apply.rs @@ -1,6 +1,6 @@ use peace::{ cfg::ApplyCheck, - resources::type_reg::untagged::BoxDataTypeDowncast, + resource_rt::type_reg::untagged::BoxDataTypeDowncast, rt_model::outcomes::{ItemApply, ItemApplyPartial, ItemApplyRt}, }; diff --git a/workspace_tests/src/rt_model/outcomes/item_apply_boxed.rs b/workspace_tests/src/rt_model/outcomes/item_apply_boxed.rs index 95e0d473c..93a3046ab 100644 --- a/workspace_tests/src/rt_model/outcomes/item_apply_boxed.rs +++ b/workspace_tests/src/rt_model/outcomes/item_apply_boxed.rs @@ -2,7 +2,7 @@ use std::ops::{Deref, DerefMut}; use peace::{ cfg::{state::External, ApplyCheck, State}, - resources::type_reg::untagged::BoxDataTypeDowncast, + resource_rt::type_reg::untagged::BoxDataTypeDowncast, rt_model::outcomes::{ItemApply, ItemApplyBoxed, ItemApplyPartial}, }; use pretty_assertions::assert_eq; diff --git a/workspace_tests/src/rt_model/outcomes/item_apply_partial.rs b/workspace_tests/src/rt_model/outcomes/item_apply_partial.rs index d36e28566..5572fbbd7 100644 --- a/workspace_tests/src/rt_model/outcomes/item_apply_partial.rs +++ b/workspace_tests/src/rt_model/outcomes/item_apply_partial.rs @@ -1,6 +1,6 @@ use peace::{ cfg::ApplyCheck, - resources::type_reg::untagged::BoxDataTypeDowncast, + resource_rt::type_reg::untagged::BoxDataTypeDowncast, rt_model::outcomes::{ItemApplyPartial, ItemApplyPartialRt}, }; diff --git a/workspace_tests/src/rt_model/outcomes/item_apply_partial_boxed.rs b/workspace_tests/src/rt_model/outcomes/item_apply_partial_boxed.rs index 85e9ba372..03b8bc71a 100644 --- a/workspace_tests/src/rt_model/outcomes/item_apply_partial_boxed.rs +++ b/workspace_tests/src/rt_model/outcomes/item_apply_partial_boxed.rs @@ -2,7 +2,7 @@ use std::ops::{Deref, DerefMut}; use peace::{ cfg::{state::External, ApplyCheck, State}, - resources::type_reg::untagged::BoxDataTypeDowncast, + resource_rt::type_reg::untagged::BoxDataTypeDowncast, rt_model::outcomes::{ItemApplyPartial, ItemApplyPartialBoxed}, }; use pretty_assertions::assert_eq; diff --git a/workspace_tests/src/rt_model/outcomes/item_apply_partial_rt.rs b/workspace_tests/src/rt_model/outcomes/item_apply_partial_rt.rs index c1588fff0..89311b4ba 100644 --- a/workspace_tests/src/rt_model/outcomes/item_apply_partial_rt.rs +++ b/workspace_tests/src/rt_model/outcomes/item_apply_partial_rt.rs @@ -1,6 +1,6 @@ use peace::{ cfg::ApplyCheck, - resources::type_reg::untagged::BoxDataTypeDowncast, + resource_rt::type_reg::untagged::BoxDataTypeDowncast, rt_model::outcomes::{ItemApplyPartial, ItemApplyPartialRt}, }; diff --git a/workspace_tests/src/rt_model/outcomes/item_apply_rt.rs b/workspace_tests/src/rt_model/outcomes/item_apply_rt.rs index 70199b4f4..f042e0b5b 100644 --- a/workspace_tests/src/rt_model/outcomes/item_apply_rt.rs +++ b/workspace_tests/src/rt_model/outcomes/item_apply_rt.rs @@ -1,6 +1,6 @@ use peace::{ cfg::ApplyCheck, - resources::type_reg::untagged::BoxDataTypeDowncast, + resource_rt::type_reg::untagged::BoxDataTypeDowncast, rt_model::outcomes::{ItemApply, ItemApplyPartial, ItemApplyRt}, }; diff --git a/workspace_tests/src/rt_model/states_serializer.rs b/workspace_tests/src/rt_model/states_serializer.rs index 7203e7ccd..478695429 100644 --- a/workspace_tests/src/rt_model/states_serializer.rs +++ b/workspace_tests/src/rt_model/states_serializer.rs @@ -1,6 +1,6 @@ use peace::{ cfg::{flow_id, item_id}, - resources::{ + resource_rt::{ internal::StatesMut, paths::StatesCurrentFile, states::StatesCurrentStored, type_reg::untagged::TypeReg, }, diff --git a/workspace_tests/src/rt_model/storage.rs b/workspace_tests/src/rt_model/storage.rs index 6c70d60e1..df1a1a94c 100644 --- a/workspace_tests/src/rt_model/storage.rs +++ b/workspace_tests/src/rt_model/storage.rs @@ -1,5 +1,5 @@ use peace::{ - resources::type_reg::untagged::{TypeMapOpt, TypeReg}, + resource_rt::type_reg::untagged::{TypeMapOpt, TypeReg}, rt_model::{params::WorkspaceParams, Error, Storage}, }; use serde::{Deserialize, Serialize}; diff --git a/workspace_tests/src/test_support.rs b/workspace_tests/src/test_support.rs index a982f223c..9d3585d10 100644 --- a/workspace_tests/src/test_support.rs +++ b/workspace_tests/src/test_support.rs @@ -1,7 +1,7 @@ use futures::stream::{self, StreamExt, TryStreamExt}; use peace::{ cfg::{AppName, FlowId, Profile}, - resources::{ + resource_rt::{ internal::{FlowParamsFile, ProfileParamsFile, WorkspaceParamsFile}, paths::{FlowDir, ProfileDir}, resources::ts::SetUp, diff --git a/workspace_tests/src/vec_copy_item.rs b/workspace_tests/src/vec_copy_item.rs index 62e1c0583..f7d8e2a12 100644 --- a/workspace_tests/src/vec_copy_item.rs +++ b/workspace_tests/src/vec_copy_item.rs @@ -13,7 +13,7 @@ use peace::{ Data, }, params::Params, - resources::{resources::ts::Empty, states::StatesCurrentStored, Resources}, + resource_rt::{resources::ts::Empty, states::StatesCurrentStored, Resources}, rt_model::ItemWrapper, }; use serde::{Deserialize, Serialize}; From 6f7eea0b426584a6ce08330b67ac7a5dd6500daf Mon Sep 17 00:00:00 2001 From: Azriel Hoh Date: Mon, 3 Jun 2024 12:01:25 +1200 Subject: [PATCH 6/6] Updated `CHANGELOG.md`. --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb68f648d..e7409f794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ * Move `OutputFormat` and `OutputFormatParseError` to `peace_cli_model` crate. ([#182], [#189]) * Render progress and outcome diagram using `dot_ix`. ([#182], [#189], [#191]) * Experimented renaming `Item` trait to `Step` (reverted). ([#187], [#192]) -* Rename `peace_resources` crate to `peace_resources_rt`. ([#182], [#187], [#193]) +* Rename `peace_resources` crate to `peace_resource_rt`. ([#182], [#187], [#193], [#194]) [#182]: https://github.com/azriel91/peace/issues/182 @@ -15,6 +15,7 @@ [#191]: https://github.com/azriel91/peace/pull/191 [#192]: https://github.com/azriel91/peace/pull/192 [#193]: https://github.com/azriel91/peace/pull/193 +[#194]: https://github.com/azriel91/peace/pull/194 ## 0.0.13 (2024-02-03)