From b2191618ee0dc66419b582593309073d2324bc11 Mon Sep 17 00:00:00 2001 From: Azriel Hoh Date: Wed, 10 Jan 2024 17:52:14 +1300 Subject: [PATCH] Run `cargo fmt --all`. --- examples/envman/src/cmds/common.rs | 2 +- examples/envman/src/cmds/profile_list_cmd.rs | 2 +- examples/envman/src/cmds/profile_switch_cmd.rs | 2 +- workspace_tests/src/cmd_model/cmd_block_outcome.rs | 2 +- workspace_tests/src/cmd_model/item_stream_outcome.rs | 6 +----- workspace_tests/src/params/derive.rs | 12 ++++++------ workspace_tests/src/params/params_spec.rs | 2 +- workspace_tests/src/params/params_spec_fieldless.rs | 2 +- workspace_tests/src/params/params_specs.rs | 2 +- workspace_tests/src/params/value_resolution_ctx.rs | 2 +- workspace_tests/src/params/value_spec.rs | 2 +- .../src/resources/internal/state_diffs_mut.rs | 2 +- workspace_tests/src/resources/internal/states_mut.rs | 2 +- .../src/resources/internal/workspace_params_file.rs | 2 +- workspace_tests/src/resources/state_diffs.rs | 2 +- workspace_tests/src/resources/states.rs | 2 +- .../src/rt/cmds/diff_cmd/diff_info_spec.rs | 2 +- workspace_tests/src/rt_model/error.rs | 2 +- workspace_tests/src/rt_model/item_boxed.rs | 2 +- workspace_tests/src/rt_model/item_graph.rs | 2 +- .../src/rt_model/workspace_dirs_builder.rs | 2 +- 21 files changed, 26 insertions(+), 30 deletions(-) diff --git a/examples/envman/src/cmds/common.rs b/examples/envman/src/cmds/common.rs index 37130a23e..98dc34947 100644 --- a/examples/envman/src/cmds/common.rs +++ b/examples/envman/src/cmds/common.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{app_name}, + cfg::app_name, cmd::ctx::CmdCtx, rt_model::{output::OutputWrite, Workspace, WorkspaceSpec}, }; diff --git a/examples/envman/src/cmds/profile_list_cmd.rs b/examples/envman/src/cmds/profile_list_cmd.rs index 6aa48b6a9..72453c95f 100644 --- a/examples/envman/src/cmds/profile_list_cmd.rs +++ b/examples/envman/src/cmds/profile_list_cmd.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{app_name}, + cfg::app_name, cmd::{ctx::CmdCtx, scopes::MultiProfileNoFlowView}, fmt::presentable::{Heading, HeadingLevel}, rt_model::{output::OutputWrite, Workspace, WorkspaceSpec}, diff --git a/examples/envman/src/cmds/profile_switch_cmd.rs b/examples/envman/src/cmds/profile_switch_cmd.rs index 6ec3e9456..7b007565f 100644 --- a/examples/envman/src/cmds/profile_switch_cmd.rs +++ b/examples/envman/src/cmds/profile_switch_cmd.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{app_name}, + cfg::app_name, cmd::{ctx::CmdCtx, scopes::MultiProfileNoFlowView}, rt_model::output::OutputWrite, }; diff --git a/workspace_tests/src/cmd_model/cmd_block_outcome.rs b/workspace_tests/src/cmd_model/cmd_block_outcome.rs index b11327232..862421fb4 100644 --- a/workspace_tests/src/cmd_model/cmd_block_outcome.rs +++ b/workspace_tests/src/cmd_model/cmd_block_outcome.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{item_id}, + cfg::item_id, cmd_model::{CmdBlockOutcome, StreamOutcomeAndErrors, ValueAndStreamOutcome}, rt_model::{fn_graph::StreamOutcome, IndexMap}, }; diff --git a/workspace_tests/src/cmd_model/item_stream_outcome.rs b/workspace_tests/src/cmd_model/item_stream_outcome.rs index bf15446f0..3be421186 100644 --- a/workspace_tests/src/cmd_model/item_stream_outcome.rs +++ b/workspace_tests/src/cmd_model/item_stream_outcome.rs @@ -1,8 +1,4 @@ -use peace::{ - cfg::{item_id}, - cmd_model::ItemStreamOutcome, - rt_model::fn_graph::StreamOutcomeState, -}; +use peace::{cfg::item_id, cmd_model::ItemStreamOutcome, rt_model::fn_graph::StreamOutcomeState}; #[test] fn map() { diff --git a/workspace_tests/src/params/derive.rs b/workspace_tests/src/params/derive.rs index dcbc23cbe..830f1efc4 100644 --- a/workspace_tests/src/params/derive.rs +++ b/workspace_tests/src/params/derive.rs @@ -70,7 +70,7 @@ mod struct_params { use serde::{Deserialize, Serialize}; use peace::{ - cfg::{item_id}, + cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, resources::{resources::ts::SetUp, Resources}, }; @@ -269,7 +269,7 @@ mod struct_with_type_params { use serde::{Deserialize, Serialize}; use peace::{ - cfg::{item_id}, + cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, resources::{resources::ts::SetUp, Resources}, }; @@ -489,7 +489,7 @@ mod tuple_params { use serde::{Deserialize, Serialize}; use peace::{ - cfg::{item_id}, + cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, resources::{resources::ts::SetUp, Resources}, }; @@ -665,7 +665,7 @@ mod tuple_with_type_params { use serde::{Deserialize, Serialize}; use peace::{ - cfg::{item_id}, + cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, resources::{resources::ts::SetUp, Resources}, }; @@ -866,7 +866,7 @@ mod enum_params { use serde::{Deserialize, Serialize}; use peace::{ - cfg::{item_id}, + cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, resources::{resources::ts::SetUp, Resources}, }; @@ -1499,7 +1499,7 @@ mod struct_recursive_value { use serde::{Deserialize, Serialize}; use peace::{ - cfg::{item_id}, + cfg::item_id, params::{Params, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec}, resources::{resources::ts::SetUp, Resources}, }; diff --git a/workspace_tests/src/params/params_spec.rs b/workspace_tests/src/params/params_spec.rs index 4f20105c7..814632c5d 100644 --- a/workspace_tests/src/params/params_spec.rs +++ b/workspace_tests/src/params/params_spec.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{item_id}, + cfg::item_id, params::{ AnySpecRt, AnySpecRtBoxed, FieldNameAndType, FieldWiseSpecRt, Params, ParamsResolveError, ParamsSpec, ValueResolutionCtx, ValueResolutionMode, ValueSpec, ValueSpecRt, diff --git a/workspace_tests/src/params/params_spec_fieldless.rs b/workspace_tests/src/params/params_spec_fieldless.rs index d6228ec33..7d0cc66f5 100644 --- a/workspace_tests/src/params/params_spec_fieldless.rs +++ b/workspace_tests/src/params/params_spec_fieldless.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{item_id}, + cfg::item_id, params::{ AnySpecRt, AnySpecRtBoxed, ParamsFieldless, ParamsResolveError, ParamsSpecFieldless, ValueResolutionCtx, ValueResolutionMode, ValueSpecRt, diff --git a/workspace_tests/src/params/params_specs.rs b/workspace_tests/src/params/params_specs.rs index 38ee1fc7d..c2a0a2904 100644 --- a/workspace_tests/src/params/params_specs.rs +++ b/workspace_tests/src/params/params_specs.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{item_id}, + cfg::item_id, params::{ParamsSpec, ParamsSpecs}, }; diff --git a/workspace_tests/src/params/value_resolution_ctx.rs b/workspace_tests/src/params/value_resolution_ctx.rs index 32154091d..73719c271 100644 --- a/workspace_tests/src/params/value_resolution_ctx.rs +++ b/workspace_tests/src/params/value_resolution_ctx.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{item_id}, + cfg::item_id, params::{FieldNameAndType, ValueResolutionCtx, ValueResolutionMode}, }; diff --git a/workspace_tests/src/params/value_spec.rs b/workspace_tests/src/params/value_spec.rs index 612c7952c..e73cfa04b 100644 --- a/workspace_tests/src/params/value_spec.rs +++ b/workspace_tests/src/params/value_spec.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{item_id}, + cfg::item_id, params::{ AnySpecRt, AnySpecRtBoxed, ParamsResolveError, ValueResolutionCtx, ValueResolutionMode, ValueSpec, ValueSpecRt, diff --git a/workspace_tests/src/resources/internal/state_diffs_mut.rs b/workspace_tests/src/resources/internal/state_diffs_mut.rs index 94c2d21e0..69afc8ccf 100644 --- a/workspace_tests/src/resources/internal/state_diffs_mut.rs +++ b/workspace_tests/src/resources/internal/state_diffs_mut.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{item_id}, + cfg::item_id, resources::{internal::StateDiffsMut, type_reg::untagged::TypeMap}, }; diff --git a/workspace_tests/src/resources/internal/states_mut.rs b/workspace_tests/src/resources/internal/states_mut.rs index 19de42de6..8cbab3812 100644 --- a/workspace_tests/src/resources/internal/states_mut.rs +++ b/workspace_tests/src/resources/internal/states_mut.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{item_id}, + cfg::item_id, resources::{internal::StatesMut, states::ts::Current, type_reg::untagged::TypeMap}, }; diff --git a/workspace_tests/src/resources/internal/workspace_params_file.rs b/workspace_tests/src/resources/internal/workspace_params_file.rs index d711f3b5f..17d097845 100644 --- a/workspace_tests/src/resources/internal/workspace_params_file.rs +++ b/workspace_tests/src/resources/internal/workspace_params_file.rs @@ -4,7 +4,7 @@ use std::{ }; use peace::{ - cfg::{app_name}, + cfg::app_name, resources::{ internal::WorkspaceParamsFile, paths::{PeaceAppDir, PeaceDir}, diff --git a/workspace_tests/src/resources/state_diffs.rs b/workspace_tests/src/resources/state_diffs.rs index 0fd2fffff..0d37435ed 100644 --- a/workspace_tests/src/resources/state_diffs.rs +++ b/workspace_tests/src/resources/state_diffs.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{item_id}, + cfg::item_id, resources::{internal::StateDiffsMut, states::StateDiffs, type_reg::untagged::TypeMap}, }; diff --git a/workspace_tests/src/resources/states.rs b/workspace_tests/src/resources/states.rs index f1c092739..ed3b65d42 100644 --- a/workspace_tests/src/resources/states.rs +++ b/workspace_tests/src/resources/states.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{item_id}, + cfg::item_id, resources::{internal::StatesMut, states::StatesCurrent, type_reg::untagged::TypeMap}, }; diff --git a/workspace_tests/src/rt/cmds/diff_cmd/diff_info_spec.rs b/workspace_tests/src/rt/cmds/diff_cmd/diff_info_spec.rs index f43369690..e1a57b5ed 100644 --- a/workspace_tests/src/rt/cmds/diff_cmd/diff_info_spec.rs +++ b/workspace_tests/src/rt/cmds/diff_cmd/diff_info_spec.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{profile}, + cfg::profile, rt::cmds::{DiffInfoSpec, DiffStateSpec}, }; diff --git a/workspace_tests/src/rt_model/error.rs b/workspace_tests/src/rt_model/error.rs index dc36e8920..255f92ef1 100644 --- a/workspace_tests/src/rt_model/error.rs +++ b/workspace_tests/src/rt_model/error.rs @@ -1,7 +1,7 @@ use std::fmt; use peace::{ - cfg::{item_id}, + cfg::item_id, miette::{GraphicalReportHandler, GraphicalTheme}, params::{ParamsSpec, ParamsSpecs}, rt_model::Error, diff --git a/workspace_tests/src/rt_model/item_boxed.rs b/workspace_tests/src/rt_model/item_boxed.rs index fd491ecca..0d9706cda 100644 --- a/workspace_tests/src/rt_model/item_boxed.rs +++ b/workspace_tests/src/rt_model/item_boxed.rs @@ -1,7 +1,7 @@ use std::any::TypeId; use peace::{ - cfg::{item_id}, + cfg::item_id, data::{DataAccessDyn, TypeIds}, rt_model::{ItemBoxed, ItemRt}, }; diff --git a/workspace_tests/src/rt_model/item_graph.rs b/workspace_tests/src/rt_model/item_graph.rs index 9c5e665bf..3d005bef5 100644 --- a/workspace_tests/src/rt_model/item_graph.rs +++ b/workspace_tests/src/rt_model/item_graph.rs @@ -1,5 +1,5 @@ use peace::{ - cfg::{item_id}, + cfg::item_id, resources::{ internal::StatesMut, states::{StatesCurrent, StatesSerde}, diff --git a/workspace_tests/src/rt_model/workspace_dirs_builder.rs b/workspace_tests/src/rt_model/workspace_dirs_builder.rs index 0dc4a3888..c95e92530 100644 --- a/workspace_tests/src/rt_model/workspace_dirs_builder.rs +++ b/workspace_tests/src/rt_model/workspace_dirs_builder.rs @@ -1,7 +1,7 @@ use std::path::Path; use peace::{ - cfg::{app_name}, + cfg::app_name, rt_model::{Error, NativeError, WorkspaceDirsBuilder, WorkspaceSpec}, };