Implement Display for Version

2 files changed, 13 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 901f4e8..fad115b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
 - Remove the `test-pro` and `test-storage` features.
+- Implement `Display` for `Version`.
 
 # v0.3.3 (2019-01-16)
 - Add the `get_production_info` and `clear_new_sd_card_warning` methods to the
diff --git a/src/lib.rs b/src/lib.rs
index 02a622b..807a9ca 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -93,6 +93,8 @@ mod otp;
 mod pws;
 mod util;
 
+use std::fmt;
+
 use nitrokey_sys;
 
 pub use crate::auth::{Admin, Authenticate, User};
@@ -125,6 +127,16 @@ pub struct Version {
     pub minor: u32,
 }
 
+impl fmt::Display for Version {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if self.git.is_empty() {
+            write!(f, "v{}.{}", self.major, self.minor)
+        } else {
+            f.write_str(&self.git)
+        }
+    }
+}
+
 /// Enables or disables debug output.  Calling this method with `true` is equivalent to setting the
 /// log level to `Debug`; calling it with `false` is equivalent to the log level `Error` (see
 /// [`set_log_level`][]).