Merge pull request #20 from mathstuf/avoid-force-alloc

keytypes: use Cow<'static, str> to avoid forcing allocation

Author: mathstuf

src/keytypes/blacklist.rs

@@ -52,7 +52,7 @@ pub enum HashType {
     /// x509 data
     Tbs,
     /// Custom hash type
-    Other(String),
+    Other(Cow<'static, str>),
 }
 
 impl HashType {

src/keytypes/dns_resolver.rs

@@ -53,7 +53,7 @@ pub enum QueryType {
     /// An AFS database address.
     AFSDB,
     /// A custom DNS record.
-    Other(String),
+    Other(Cow<'static, str>),
 }
 
 impl QueryType {
@@ -82,15 +82,15 @@ pub struct Description {
     /// If not specified, `A` and `AAAA` entries will be found.
     pub query_type: Option<QueryType>,
     /// The name to resolve.
-    pub name: String,
+    pub name: Cow<'static, str>,
 }
 
 impl KeyDescription for Description {
     fn description(&self) -> Cow<str> {
-        Cow::Owned(if let Some(ref query_type) = self.query_type {
-            format!("{}:{}", query_type.name(), self.name)
+        if let Some(ref query_type) = self.query_type {
+            Cow::Owned(format!("{}:{}", query_type.name(), self.name))
         } else {
             self.name.clone()
-        })
+        }
     }
 }

src/keytypes/encrypted.rs

@@ -115,7 +115,7 @@ pub enum Payload {
         /// The type of key to use for encrypting the new key.
         keytype: MasterKeyType,
         /// The description of the key to use for encrypting the new key.
-        description: String,
+        description: Cow<'static, str>,
         /// The size of the key to generate.
         keylen: usize,
     },
@@ -136,7 +136,7 @@ pub enum Payload {
         /// Must be the same type as when the key was created.
         keytype: MasterKeyType,
         /// The description of the key to use for encrypting the new key.
-        description: String,
+        description: Cow<'static, str>,
     },
 }
 

src/keytypes/logon.rs

@@ -53,9 +53,9 @@ impl KeyType for Logon {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Description {
     /// They subtype of the key.
-    pub subtype: String,
+    pub subtype: Cow<'static, str>,
     /// The description of the key.
-    pub description: String,
+    pub description: Cow<'static, str>,
 }
 
 impl KeyDescription for Description {