refactor: apply linter's advices

Signed-off-by: David Bernard <david.bernard.31@gmail.com>

cdevents-sdk/src/uri.rs

@@ -60,9 +60,9 @@ impl TryFrom<String> for Uri {
     }
 }
 
-impl ToString for Uri {
-    fn to_string(&self) -> String {
-        self.0.as_str().to_owned()//into_string()
+impl std::fmt::Display for Uri {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.as_str().fmt(f)
     }
 }
 

cdevents-sdk/src/uri_reference.rs

@@ -49,9 +49,9 @@ impl TryFrom<String> for UriReference {
     }
 }
 
-impl ToString for UriReference {
-    fn to_string(&self) -> String {
-        self.0.as_str().to_owned()//into_string()
+impl std::fmt::Display for UriReference {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.as_str().fmt(f)
     }
 }
 

generator/src/main.rs

@@ -1,3 +1,5 @@
+mod version;
+
 use anyhow::{Context, Result};
 use clap::Parser;
 use cruet::Inflector;
@@ -6,7 +8,8 @@ use handlebars::{DirectorySourceOptions, Handlebars};
 use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
-use std::{cmp::Ordering, collections::HashMap, fs, path::PathBuf};
+use std::{collections::HashMap, fs, path::PathBuf};
+use version::Version;
 
 /// generator of part of the rust code of cdevents from spec
 #[derive(Parser, Debug)]
@@ -195,28 +198,6 @@ struct VariantInfo {
     spec_version: String,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd)]
-struct Version {
-    major: u8,
-    minor: u8,
-    patch: u8,
-    modifier: String,
-}
-
-impl Ord for Version {
-    fn cmp(&self, other: &Self) -> Ordering {
-        let mut r = self.major.cmp(&other.major);
-        if r.is_eq() {
-            r = self.minor.cmp(&other.minor);
-        }
-        if r.is_eq() {
-            r = self.patch.cmp(&other.patch);
-        }
-        //TODO compare modifier with semantic ("snapshot", "draft", "alpha", "beta", "rc", "ga", "")
-        r
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize)]
 struct StructDef {
     type_info: TypeInfo,

generator/src/version.rs

@@ -0,0 +1,31 @@
+use std::cmp::Ordering;
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub(crate) struct Version {
+    pub(crate) major: u8,
+    pub(crate) minor: u8,
+    pub(crate) patch: u8,
+    pub(crate) modifier: String,
+}
+
+impl PartialOrd for Version {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Ord for Version {
+    fn cmp(&self, other: &Self) -> Ordering {
+        let mut r = self.major.cmp(&other.major);
+        if r.is_eq() {
+            r = self.minor.cmp(&other.minor);
+        }
+        if r.is_eq() {
+            r = self.patch.cmp(&other.patch);
+        }
+        //TODO compare modifier with semantic ("snapshot", "draft", "alpha", "beta", "rc", "ga", "")
+        r
+    }
+}