address review comments

mozilla · Apr 16, 2024 · 6d6470b · 6d6470b
1 parent 8f7cbfa
commit 6d6470b
Show file tree

Hide file tree

Showing 49 changed files with 1,451 additions and 520 deletions.
diff --git a/src/bindgen/config.rs b/src/bindgen/config.rs
@@ -47,9 +47,6 @@ impl FromStr for Language {
             "Java-JNA" => Ok(Language::JavaJna),
             "Java-Jna" => Ok(Language::JavaJna),
             "java-jna" => Ok(Language::JavaJna),
-            "JavaJNA" => Ok(Language::JavaJna),
-            "JavaJna" => Ok(Language::JavaJna),
-            "javajna" => Ok(Language::JavaJna),
             _ => Err(format!("Unrecognized Language: '{}'.", s)),
         }
     }
@@ -61,18 +58,10 @@ impl Display for Language {
             f,
             "{}",
             match self {
-                Language::Cxx => {
-                    "cxx"
-                }
-                Language::C => {
-                    "c"
-                }
-                Language::Cython => {
-                    "cython"
-                }
-                Language::JavaJna => {
-                    "java-jna"
-                }
+                Language::Cxx => "cxx",
+                Language::C => "c",
+                Language::Cython => "cython",
+                Language::JavaJna => "java-jna",
             }
         )
     }
@@ -85,7 +74,9 @@ impl Language {
         match self {
             Language::Cxx | Language::C => "typedef",
             Language::Cython => "ctypedef",
-            _ => unimplemented!(),
+            Language::JavaJna => {
+                unreachable!("the java-jna backend does not use this typedef impl")
+            }
         }
     }
 }

diff --git a/src/bindgen/ir/enumeration.rs b/src/bindgen/ir/enumeration.rs
@@ -721,7 +721,7 @@ impl Enum {
                     write!(out, "{}enum {}", config.style.cython_def(), tag_name);
                 }
             }
-            _ => unimplemented!(),
+            Language::JavaJna => unreachable!("the java-jna backend does not use this enum impl"),
         }
         out.open_brace();