transpile: Update keywords (#1627)

+ Add `await` and `gen`
+ Remove symbols that are not keywords
+ Reorder to match the Rust Reference

Author: kkysen

Cargo.lock

@@ -45,4 +45,5 @@ tempfile = "3.5.0"
 llvm-static = ["c2rust-ast-exporter/llvm-static"]
 
 [dev-dependencies]
+fs-err = "3.3.0"
 insta = { version = "1.46.3", features = ["glob", "json"] }

c2rust-transpile/Cargo.toml

@@ -25,13 +25,16 @@ pub struct TypeConverter {
     extern_crates: CrateSet,
 }
 
-pub const RESERVED_NAMES: [&str; 103] = [
+pub const RESERVED_NAMES: [&str; 100] = [
     // Keywords currently in use
     "as",
+    "async",
+    "await",
     "break",
     "const",
     "continue",
     "crate",
+    "dyn",
     "else",
     "enum",
     "extern",
@@ -50,8 +53,8 @@ pub const RESERVED_NAMES: [&str; 103] = [
     "pub",
     "ref",
     "return",
-    "Self",
     "self",
+    "Self",
     "static",
     "struct",
     "super",
@@ -62,27 +65,21 @@ pub const RESERVED_NAMES: [&str; 103] = [
     "use",
     "where",
     "while",
-    "dyn",
     // Keywords reserved for future use
     "abstract",
-    "alignof",
     "become",
     "box",
     "do",
     "final",
+    "gen",
     "macro",
-    "offsetof",
     "override",
     "priv",
-    "proc",
-    "pure",
-    "sizeof",
+    "try",
     "typeof",
     "unsized",
     "virtual",
     "yield",
-    "async",
-    "try",
     // Types exported in prelude
     "Copy",
     "Send",

c2rust-transpile/src/convert_type.rs

@@ -5,7 +5,9 @@ use std::path::PathBuf;
 use std::process::Command;
 
 use c2rust_rust_tools::rustc;
+use c2rust_transpile::convert_type::RESERVED_NAMES;
 use c2rust_transpile::{ReplaceMode, TranspilerConfig};
+use itertools::Itertools;
 
 fn config() -> TranspilerConfig {
     TranspilerConfig {
@@ -135,6 +137,8 @@ fn transpile_snapshot(platform: Option<&str>, c_path: &Path) {
 
 #[test]
 fn transpile_all_snapshots() {
+    generate_keywords_test();
+
     // TODO parallelize these `insta::glob!`s across multiple `#[test]`s
     // now that we use `cargo nextest`.
 
@@ -180,6 +184,25 @@ fn transpile_all_snapshots() {
     });
 }
 
+fn generate_keywords_test() {
+    // Common keywords we need to filter out.
+    let c_keywords = [
+        "break", "const", "continue", "else", "enum", "extern", "for", "if", "return", "static",
+        "struct", "while", "do", "typeof", "char",
+    ];
+    // These don't work yet.  We need to fix these.
+    let broken_rust_keywords = ["await"];
+    let mut c_code = RESERVED_NAMES
+        .into_iter()
+        .filter(|keyword| !c_keywords.contains(keyword))
+        .filter(|keyword| !broken_rust_keywords.contains(keyword))
+        .map(|name| format!("void {name}(void) {{}}"))
+        .join("\n\n");
+    c_code.push_str("\n");
+    let c_path = Path::new("tests/snapshots/keywords.c");
+    fs_err::write(c_path, c_code).unwrap();
+}
+
 #[test]
 fn check_c_decl_map() {
     insta::glob!("c_decls_snapshots/*.c", transpile_with_c_decl_map_snapshot);

c2rust-transpile/tests/snapshots.rs

@@ -0,0 +1,167 @@
+void as(void) {}
+
+void async(void) {}
+
+void crate(void) {}
+
+void dyn(void) {}
+
+void false(void) {}
+
+void fn(void) {}
+
+void impl(void) {}
+
+void in(void) {}
+
+void let(void) {}
+
+void loop(void) {}
+
+void match(void) {}
+
+void mod(void) {}
+
+void move(void) {}
+
+void mut(void) {}
+
+void pub(void) {}
+
+void ref(void) {}
+
+void self(void) {}
+
+void Self(void) {}
+
+void super(void) {}
+
+void trait(void) {}
+
+void true(void) {}
+
+void type(void) {}
+
+void unsafe(void) {}
+
+void use(void) {}
+
+void where(void) {}
+
+void abstract(void) {}
+
+void become(void) {}
+
+void box(void) {}
+
+void final(void) {}
+
+void gen(void) {}
+
+void macro(void) {}
+
+void override(void) {}
+
+void priv(void) {}
+
+void try(void) {}
+
+void unsized(void) {}
+
+void virtual(void) {}
+
+void yield(void) {}
+
+void Copy(void) {}
+
+void Send(void) {}
+
+void Sized(void) {}
+
+void Sync(void) {}
+
+void Drop(void) {}
+
+void Fn(void) {}
+
+void FnMut(void) {}
+
+void FnOnce(void) {}
+
+void Box(void) {}
+
+void ToOwned(void) {}
+
+void Clone(void) {}
+
+void PartialEq(void) {}
+
+void PartialOrd(void) {}
+
+void Eq(void) {}
+
+void Ord(void) {}
+
+void AsRef(void) {}
+
+void AsMut(void) {}
+
+void Into(void) {}
+
+void From(void) {}
+
+void Default(void) {}
+
+void Iterator(void) {}
+
+void Extend(void) {}
+
+void IntoIterator(void) {}
+
+void DoubleEndedIterator(void) {}
+
+void ExactSizeIterator(void) {}
+
+void Option(void) {}
+
+void Result(void) {}
+
+void SliceConcatExt(void) {}
+
+void String(void) {}
+
+void ToString(void) {}
+
+void Vec(void) {}
+
+void bool(void) {}
+
+void f32(void) {}
+
+void f64(void) {}
+
+void i8(void) {}
+
+void i16(void) {}
+
+void i32(void) {}
+
+void i64(void) {}
+
+void i128(void) {}
+
+void isize(void) {}
+
+void u8(void) {}
+
+void u16(void) {}
+
+void u32(void) {}
+
+void u64(void) {}
+
+void u128(void) {}
+
+void usize(void) {}
+
+void str(void) {}