Fix panicking parsing of doc comments in clang-rs

Author: madsmtm

Cargo.lock

@@ -8,7 +8,9 @@ license = "Zlib OR Apache-2.0 OR MIT"
 
 [dependencies]
 # https://github.com/KyleMayes/clang-rs/pull/58
-clang = { git = "https://github.com/madsmtm/clang-rs.git", branch = "fix-ub-tokenize", features = ["runtime", "clang_10_0"] }
+# https://github.com/KyleMayes/clang-rs/pull/60
+# https://github.com/KyleMayes/clang-rs/pull/62
+clang = { git = "https://github.com/madsmtm/clang-rs.git", branch = "objc2", features = ["runtime", "clang_10_0"] }
 clang-sys = { version = "1.4.0" }
 toml_edit = "0.22.9"
 basic-toml = "0.1.2"

crates/header-translator/Cargo.toml

@@ -16,36 +16,21 @@ pub struct Documentation {
 
 impl Documentation {
     pub fn from_entity(entity: &Entity<'_>) -> Self {
-        // This can fail when the comment is non-UTF-8, so we have to
-        // potentially handle that case.
-        //
-        // TODO: Fix this in the `clang` crate.
-        let comment = std::panic::catch_unwind(|| {
-            if let Some(comment) = entity.get_comment() {
-                if let Some(parsed) = entity.get_parsed_comment() {
-                    Some(parsed)
-                } else {
-                    error!(?entity, comment, "had comment, but not parsed comment");
-                    None
+        if let Some(comment) = entity.get_comment() {
+            if let Some(parsed) = entity.get_parsed_comment() {
+                Self {
+                    children: parsed.get_children(),
                 }
             } else {
-                None
-            }
-        });
-
-        match comment {
-            Ok(Some(parsed)) => Self {
-                children: parsed.get_children(),
-            },
-            Ok(None) => Self {
-                children: Vec::new(),
-            },
-            Err(_err) => {
-                warn!(?entity, "failed fetching comment");
+                error!(?entity, comment, "had comment, but not parsed comment");
                 Self {
                     children: Vec::new(),
                 }
             }
+        } else {
+            Self {
+                children: Vec::new(),
+            }
         }
     }