added Option<CounterUnit> as member of Struct Counter

2 files changed, 3 insertions, 4 deletions

diff --git a/imag-counter/src/create.rs b/imag-counter/src/create.rs
index dab5e972..04ec3bb7 100644
--- a/imag-counter/src/create.rs
+++ b/imag-counter/src/create.rs
@@ -3,7 +3,6 @@ use std::str::FromStr;
 use libimagrt::runtime::Runtime;
 use libimagerror::trace::trace_error_exit;
 use libimagcounter::counter::Counter;
-use libimagcounter::counter::CounterUnit;
 
 pub fn create(rt: &Runtime) {
     rt.cli()
@@ -20,7 +19,7 @@ pub fn create(rt: &Runtime) {
                 .value_of("unit")
                 .unwrap_or("unit");
 
-            match Counter::new(rt.store(), String::from(name), init, CounterUnit::new(unit)) {
+            match Counter::new(rt.store(), String::from(name), init) {
                 Err(e) => {
                     warn!("Could not create Counter '{}' with initial value '{} {}'", name, init, unit);
                     trace_error_exit(&e, 1);
diff --git a/imag-counter/src/list.rs b/imag-counter/src/list.rs
index 59651a4c..0c16c019 100644
--- a/imag-counter/src/list.rs
+++ b/imag-counter/src/list.rs
@@ -19,8 +19,8 @@ pub fn list(rt: &Runtime) {
                             trace_error(&name.unwrap_err());
                         } else if value.is_err() {
                             trace_error(&value.unwrap_err());
-                        } else if unit.is_err() {
-                            trace_error(&unit.unwrap_err());
+                        } else if unit.is_none() {
+                            println!("{} - {}", name.unwrap(), value.unwrap());
                         } else {
                             println!("{} - {} {}", name.unwrap(), value.unwrap(), unit.unwrap());
                         }