aboutsummaryrefslogtreecommitdiff
path: root/mingling/src/setups
diff options
context:
space:
mode:
Diffstat (limited to 'mingling/src/setups')
-rw-r--r--mingling/src/setups/basic.rs7
-rw-r--r--mingling/src/setups/picker/basic.rs5
-rw-r--r--mingling/src/setups/picker/structural_renderer.rs12
-rw-r--r--mingling/src/setups/structural_renderer.rs12
4 files changed, 19 insertions, 17 deletions
diff --git a/mingling/src/setups/basic.rs b/mingling/src/setups/basic.rs
index 0d41d14..e2246e0 100644
--- a/mingling/src/setups/basic.rs
+++ b/mingling/src/setups/basic.rs
@@ -2,7 +2,8 @@
#![allow(deprecated)]
use mingling_core::{
- ConfirmationMode, Flag, InteractionMode, Program, ProgramCollect, YesAssumption,
+ Flag, Program, ProgramCollect,
+ config::{ConfirmationMode, ErrorOutput, InteractionMode, RenderOutput, YesAssumption},
setup::ProgramSetup,
};
@@ -95,8 +96,8 @@ where
{
fn setup(self, program: &mut Program<C>) {
program.global_flag(self.flag, |p| {
- p.stdout_setting.render_output = mingling_core::RenderOutput::Hide;
- p.stdout_setting.error_output = mingling_core::ErrorOutput::Hide;
+ p.stdout_setting.render_output = RenderOutput::Hide;
+ p.stdout_setting.error_output = ErrorOutput::Hide;
});
}
}
diff --git a/mingling/src/setups/picker/basic.rs b/mingling/src/setups/picker/basic.rs
index 438ed40..76b7857 100644
--- a/mingling/src/setups/picker/basic.rs
+++ b/mingling/src/setups/picker/basic.rs
@@ -1,8 +1,9 @@
// Doc Not Optimize
use arg_picker::{PickerArg, value::Flag};
use mingling_core::{
- ConfirmationMode, ErrorOutput, InteractionMode, Program, ProgramCollect, RenderOutput,
- YesAssumption, setup::ProgramSetup,
+ Program, ProgramCollect,
+ config::{ConfirmationMode, ErrorOutput, InteractionMode, RenderOutput, YesAssumption},
+ setup::ProgramSetup,
};
use crate::{
diff --git a/mingling/src/setups/picker/structural_renderer.rs b/mingling/src/setups/picker/structural_renderer.rs
index bd9b401..998fa16 100644
--- a/mingling/src/setups/picker/structural_renderer.rs
+++ b/mingling/src/setups/picker/structural_renderer.rs
@@ -48,27 +48,27 @@ where
fn setup(self, program: &mut Program<C>) {
#[cfg(feature = "json_serde_fmt")]
if program.pick_flag(&crate::consts::JSON_FLAG) {
- program.structural_renderer_name = crate::StructuralRendererSetting::Json;
+ program.structural_renderer_name = crate::config::StructuralRendererSetting::Json;
}
#[cfg(feature = "json_serde_fmt")]
if program.pick_flag(&crate::consts::JSON_PRETTY_FLAG) {
- program.structural_renderer_name = crate::StructuralRendererSetting::JsonPretty;
+ program.structural_renderer_name = crate::config::StructuralRendererSetting::JsonPretty;
}
#[cfg(feature = "yaml_serde_fmt")]
if program.pick_flag(&crate::consts::YAML_FLAG) {
- program.structural_renderer_name = crate::StructuralRendererSetting::Yaml;
+ program.structural_renderer_name = crate::config::StructuralRendererSetting::Yaml;
}
#[cfg(feature = "toml_serde_fmt")]
if program.pick_flag(&crate::consts::TOML_FLAG) {
- program.structural_renderer_name = crate::StructuralRendererSetting::Toml;
+ program.structural_renderer_name = crate::config::StructuralRendererSetting::Toml;
}
#[cfg(feature = "ron_serde_fmt")]
if program.pick_flag(&crate::consts::RON_FLAG) {
- program.structural_renderer_name = crate::StructuralRendererSetting::Ron;
+ program.structural_renderer_name = crate::config::StructuralRendererSetting::Ron;
}
#[cfg(feature = "ron_serde_fmt")]
if program.pick_flag(&crate::consts::RON_PRETTY_FLAG) {
- program.structural_renderer_name = crate::StructuralRendererSetting::RonPretty;
+ program.structural_renderer_name = crate::config::StructuralRendererSetting::RonPretty;
}
}
}
diff --git a/mingling/src/setups/structural_renderer.rs b/mingling/src/setups/structural_renderer.rs
index d6f45b7..6580c57 100644
--- a/mingling/src/setups/structural_renderer.rs
+++ b/mingling/src/setups/structural_renderer.rs
@@ -50,27 +50,27 @@ where
fn setup(self, program: &mut Program<C>) {
#[cfg(feature = "json_serde_fmt")]
program.global_flag("--json", |p| {
- p.structural_renderer_name = crate::StructuralRendererSetting::Json;
+ p.structural_renderer_name = crate::config::StructuralRendererSetting::Json;
});
#[cfg(feature = "json_serde_fmt")]
program.global_flag("--json-pretty", |p| {
- p.structural_renderer_name = crate::StructuralRendererSetting::JsonPretty;
+ p.structural_renderer_name = crate::config::StructuralRendererSetting::JsonPretty;
});
#[cfg(feature = "yaml_serde_fmt")]
program.global_flag("--yaml", |p| {
- p.structural_renderer_name = crate::StructuralRendererSetting::Yaml;
+ p.structural_renderer_name = crate::config::StructuralRendererSetting::Yaml;
});
#[cfg(feature = "toml_serde_fmt")]
program.global_flag("--toml", |p| {
- p.structural_renderer_name = crate::StructuralRendererSetting::Toml;
+ p.structural_renderer_name = crate::config::StructuralRendererSetting::Toml;
});
#[cfg(feature = "ron_serde_fmt")]
program.global_flag("--ron", |p| {
- p.structural_renderer_name = crate::StructuralRendererSetting::Ron;
+ p.structural_renderer_name = crate::config::StructuralRendererSetting::Ron;
});
#[cfg(feature = "ron_serde_fmt")]
program.global_flag("--ron-pretty", |p| {
- p.structural_renderer_name = crate::StructuralRendererSetting::RonPretty;
+ p.structural_renderer_name = crate::config::StructuralRendererSetting::RonPretty;
});
}
}