update format and fix warning

Author: clouds56

src/convert/_build.rs

@@ -176,14 +176,14 @@ pub struct ConvertImport1Template {
 
 
 pub fn {{ty|lower}}_to_{{code_ty|lower}}(value: &{{ty}}) -> {{code_ty}} {
-  {% if const_check -%}
+  {%- if const_check %}
   #[allow(unused_parens)]
   const {
-    {% for entry in entries -%}
+    {%- for entry in entries %}
     assert!({{to_code_expr.0}}(&{{"{" ~ value_prefix}}{{ entry.0 | pad_right(*k_len) }}{{value_suffix ~ "}"}}){{to_code_expr.1}} == {{entry.1 | hex}});
-    {% endfor -%}
+    {%- endfor %}
   }
-  {% endif -%}
+  {%- endif %}
   {{to_code_expr.0}}value{{to_code_expr.1}}
 }
 
@@ -192,28 +192,29 @@ impl crate::numeric::AsCode<{{ty}}> for crate::numeric::Coder {
   fn as_code(value: &{{ty}}) -> Self::Code {
     {{ty|lower}}_to_{{code_ty|lower}}(value)
   }
+  #[allow(unreachable_patterns)]
   fn from_code(code: Self::Code) -> Option<{{ty}}> {
     match code {
-      {% for entry in entries|unique -%}
+      {%- for entry in entries|unique %}
       {{entry.1 | hex}} => Some({{value_prefix}}{{ entry.0 | pad_right(*k_len) }}{{value_suffix}}),
-      {% endfor -%}
+      {%- endfor %}
       _ => None,
     }
   }
-  {% if let Some(from_code_expr) = from_code_expr -%}
+  {%- if let Some(from_code_expr) = from_code_expr %}
   unsafe fn from_code_unchecked(code: Self::Code) -> {{ty}} {
     {{from_code_expr.0}}code{{from_code_expr.1}}
   }
-  {% endif -%}
+  {%- endif %}
 }
 
 {% if !const_check -%}
 #[test]
 #[allow(unused_parens)]
 fn test_code() {
-  {% for entry in entries -%}
+  {%- for entry in entries %}
   assert!({{to_code_expr.0}}(&{{"{" ~ value_prefix}}{{ entry.0 | pad_right(*k_len) }}{{value_suffix ~ "}"}}){{to_code_expr.1}} == {{entry.1 | hex}});
-  {% endfor -%}
+  {%- endfor %}
 }
 {% endif -%}
 "#)]
@@ -375,7 +376,8 @@ impl KeyType {
   pub fn as_from_code_expr(self) -> Option<&'static str> {
     match self {
       KeyType::HUT => None,
-      KeyType::Winput | KeyType::WinVk => Some("unsafe { crate::numeric::convert_from_code_unchecked({}) }"),
+      KeyType::Winput => Some("unsafe { std::mem::transmute({}) }"),
+      KeyType::WinVk => Some("Vk({})"),
       _ => None,
     }
   }

src/numeric/generated.HUT.rs

@@ -10,6 +10,7 @@ impl crate::numeric::AsCode<Usage> for crate::numeric::Coder {
   fn as_code(value: &Usage) -> Self::Code {
     usage_to_u32(value)
   }
+  #[allow(unreachable_patterns)]
   fn from_code(code: Self::Code) -> Option<Usage> {
     match code {
       0x90001 => Some(Button::Button(1)                                  .usage()),
@@ -158,7 +159,7 @@ impl crate::numeric::AsCode<Usage> for crate::numeric::Coder {
       _ => None,
     }
   }
-  }
+}
 
 #[test]
 #[allow(unused_parens)]
@@ -307,4 +308,4 @@ fn test_code() {
   assert!(AsUsage::usage_value((&{KeyboardKeypad::KeypadPeriodandDelete              .usage()})) == 0x70063);
   assert!(AsUsage::usage_value((&{KeyboardKeypad::KeypadPlus                         .usage()})) == 0x70057);
   assert!(AsUsage::usage_value((&{KeyboardKeypad::KeypadStar                         .usage()})) == 0x70055);
-  }
+}

src/numeric/generated.WinVk.rs

@@ -256,7 +256,7 @@ pub fn vk_to_u16(value: &Vk) -> u16 {
     assert!((&{keys::VK_SEPARATOR                      }).0 == 0x6C);
     assert!((&{keys::VK_LAUNCH_APP1                    }).0 == 0xB6);
     assert!((&{keys::VK_LAUNCH_APP2                    }).0 == 0xB7);
-    }
+  }
   value.0
 }
 
@@ -265,6 +265,7 @@ impl crate::numeric::AsCode<Vk> for crate::numeric::Coder {
   fn as_code(value: &Vk) -> Self::Code {
     vk_to_u16(value)
   }
+  #[allow(unreachable_patterns)]
   fn from_code(code: Self::Code) -> Option<Vk> {
     match code {
       0x01 => Some(keys::VK_LBUTTON                        ),
@@ -518,7 +519,7 @@ impl crate::numeric::AsCode<Vk> for crate::numeric::Coder {
     }
   }
   unsafe fn from_code_unchecked(code: Self::Code) -> Vk {
-    unsafe { crate::numeric::convert_from_code_unchecked(code) }
-  }
+    Vk(code)
   }
+}
 

src/numeric/generated.Winput.rs

@@ -164,7 +164,7 @@ pub fn vk_to_u8(value: &Vk) -> u8 {
     assert!(*(&{Vk::Separator       }) as u8 == 0x6C);
     assert!(*(&{Vk::StartApp1       }) as u8 == 0xB6);
     assert!(*(&{Vk::StartApp2       }) as u8 == 0xB7);
-    }
+  }
   *value as u8
 }
 
@@ -173,6 +173,7 @@ impl crate::numeric::AsCode<Vk> for crate::numeric::Coder {
   fn as_code(value: &Vk) -> Self::Code {
     vk_to_u8(value)
   }
+  #[allow(unreachable_patterns)]
   fn from_code(code: Self::Code) -> Option<Vk> {
     match code {
       0x01 => Some(Vk::MouseLeft       ),
@@ -339,7 +340,7 @@ impl crate::numeric::AsCode<Vk> for crate::numeric::Coder {
     }
   }
   unsafe fn from_code_unchecked(code: Self::Code) -> Vk {
-    unsafe { crate::numeric::convert_from_code_unchecked(code) }
-  }
+    unsafe { std::mem::transmute(code) }
   }
+}
 

src/numeric/mod.rs

@@ -13,6 +13,7 @@ pub trait AsCode<T> {
   }
 }
 
+#[allow(dead_code)]
 unsafe fn convert_from_code_unchecked<T, C>(code: C) -> T
 where
   Coder: AsCode<T, Code = C>,