pcvolkmer/osc-variant
1
0
Fork 0
mirror of https://github.com/pcvolkmer/osc-variant.git synced 2025-04-19 19:56:50 +00:00
Code Issues

Implement Display trait for Requirement

Browse Source
This commit is contained in:
Paul-Christian Volkmer 2023-11-23 10:07:52 +01:00
parent 2808cc3556
commit 6589349b8d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/model/requirements.rs
View File

@ -28,6 +28,7 @@ use crate::model::onkostar_editor::OnkostarEditor;
use crate::model::property_catalogue::PropertyCatalogue; use crate::model::property_catalogue::PropertyCatalogue;
use crate::model::unterformular::Unterformular; use crate::model::unterformular::Unterformular;
use crate::model::{Comparable, Listable, Sortable}; use crate::model::{Comparable, Listable, Sortable};
use std::fmt::Display;
#[allow(clippy::enum_variant_names)] #[allow(clippy::enum_variant_names)]
pub enum Requirement<'a> { pub enum Requirement<'a> {
@ -67,9 +68,9 @@ impl Sortable for Requirement<'_> {
} }
} }
impl ToString for Requirement<'_> { impl Display for Requirement<'_> {
fn to_string(&self) -> String { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self { let str = match self {
Requirement::PropertyCatalogue(item) => item.to_listed_string(), Requirement::PropertyCatalogue(item) => item.to_listed_string(),
Requirement::DataCatalogue(item) => item.to_listed_string(), Requirement::DataCatalogue(item) => item.to_listed_string(),
Requirement::DataFormReference(item) => item.to_listed_string(), Requirement::DataFormReference(item) => item.to_listed_string(),
@ -90,7 +91,8 @@ impl ToString for Requirement<'_> {
| Requirement::ExternalUnterformularSubform(name) => { | Requirement::ExternalUnterformularSubform(name) => {
format!("Unterformular (-) '{}' - hier nicht enthalten", name) format!("Unterformular (-) '{}' - hier nicht enthalten", name)
} }
} };
write!(f, "{}", str)
} }
} }
@ -138,19 +140,19 @@ where
} }
} }
Requirement::ExternalDataCatalogue(_) => { Requirement::ExternalDataCatalogue(_) => {
Some(format!(" + {}\n", entry.to_string())) Some(format!(" + {}\n", entry))
} }
Requirement::DataFormReference(_) Requirement::DataFormReference(_)
| Requirement::ExternalDataFormReference(_) | Requirement::ExternalDataFormReference(_)
| Requirement::UnterformularReference(_) | Requirement::UnterformularReference(_)
| Requirement::ExternalUnterformularReference(_) => { | Requirement::ExternalUnterformularReference(_) => {
Some(format!(" > {}\n", entry.to_string())) Some(format!(" > {}\n", entry))
} }
Requirement::DataFormSubform(_) Requirement::DataFormSubform(_)
| Requirement::ExternalDataFormSubform(_) | Requirement::ExternalDataFormSubform(_)
| Requirement::UnterformularSubform(_) | Requirement::UnterformularSubform(_)
| Requirement::ExternalUnterformularSubform(_) => { | Requirement::ExternalUnterformularSubform(_) => {
Some(format!(" * {}\n", entry.to_string())) Some(format!(" * {}\n", entry))
} }
_ => None, _ => None,
}) })