prepend fields that are rust keywords with x

Type becomes xtype etc

Author: andresv

src/keywords.rs

@@ -0,0 +1,23 @@
+// https://doc.rust-lang.org/stable/reference/keywords.html
+const KEYWORDS: [&str; 52] = [
+    "as", "break", "const", "continue", "crate", "else", "enum", "extern", "false", "fn", "for",
+    "if", "impl", "in", "let", "loop", "match", "mod", "move", "mut", "pub", "ref", "return",
+    "self", "Self", "static", "struct", "super", "trait", "true", "type", "unsafe", "use", "where",
+    "while", "async", "await", "dyn", "abstract", "become", "box", "do", "final", "macro",
+    "override", "priv", "typeof", "unsized", "virtual", "yield", "try", "union",
+];
+
+pub fn is_keyword(x: &str) -> bool {
+    KEYWORDS.contains(&x.to_lowercase().as_str())
+}
+
+#[test]
+fn value_is_a_keyword() {
+    assert!(is_keyword("type"));
+    assert!(is_keyword("TYPE"));
+}
+
+#[test]
+fn value_is_not_a_keyword() {
+    assert!(!is_keyword("rpms"));
+}

src/main.rs

@@ -6,6 +6,7 @@ use std::{fs::File, io::BufWriter, io::Write, path::PathBuf};
 use structopt::StructOpt;
 
 mod includes;
+mod keywords;
 mod pad;
 
 #[derive(Debug, StructOpt)]
@@ -522,7 +523,11 @@ fn type_name(x: &str) -> String {
 }
 
 fn field_name(x: &str) -> String {
-    x.to_snake_case()
+    if keywords::is_keyword(x) {
+        format!("x{}", x.to_snake_case())
+    } else {
+        x.to_snake_case()
+    }
 }
 
 fn enum_name(msg: &Message, signal: &Signal) -> String {