Use c"" literals

Author: kornelski

c-api/src/element.rs

@@ -49,12 +49,7 @@ pub unsafe extern "C" fn lol_html_element_namespace_uri_get(
 ) -> *const c_char {
     let element = to_ref!(element);
 
-    match element.namespace_uri() {
-        "http://www.w3.org/1999/xhtml" => static_c_str!("http://www.w3.org/1999/xhtml"),
-        "http://www.w3.org/2000/svg" => static_c_str!("http://www.w3.org/2000/svg"),
-        "http://www.w3.org/1998/Math/MathML" => static_c_str!("http://www.w3.org/1998/Math/MathML"),
-        _ => unreachable!("Unknown namespace URI"),
-    }
+    element.namespace_uri_c_str().as_ptr()
 }
 
 /// Returns the iterator over the element attributes.

c-api/src/lib.rs

@@ -50,12 +50,6 @@ macro_rules! to_str {
     };
 }
 
-macro_rules! static_c_str {
-    ($s:expr) => {
-        concat!($s, "\0").as_ptr() as *const c_char
-    };
-}
-
 macro_rules! unwrap_or_ret {
     ($expr:expr, $ret_val:expr) => {
         match $expr {

src/html/namespace.rs

@@ -20,4 +20,16 @@ impl Namespace {
             MathML => "http://www.w3.org/1998/Math/MathML",
         }
     }
+
+    #[inline]
+    #[must_use]
+    pub const fn uri_c_str(self) -> &'static std::ffi::CStr {
+        use Namespace::{Html, MathML, Svg};
+
+        match self {
+            Html => c"http://www.w3.org/1999/xhtml",
+            Svg => c"http://www.w3.org/2000/svg",
+            MathML => c"http://www.w3.org/1998/Math/MathML",
+        }
+    }
 }

src/rewritable_units/element.rs

@@ -737,6 +737,13 @@ impl<'rewriter, 'input_token, H: HandlerTypes> Element<'rewriter, 'input_token,
     pub fn source_location(&self) -> SourceLocation {
         self.start_tag.source_location()
     }
+
+    /// [Self::namespace_uri], but as a `CStr`
+    #[inline]
+    #[must_use]
+    pub fn namespace_uri_c_str(&self) -> &'static std::ffi::CStr {
+        self.start_tag.namespace_uri_c_str()
+    }
 }
 
 impl_user_data!(Element<'_, '_>);

src/rewritable_units/tokens/start_tag.rs

@@ -263,6 +263,13 @@ impl<'input_token> StartTag<'input_token> {
     pub fn source_location(&self) -> SourceLocation {
         self.raw.source_location()
     }
+
+    /// [Self::namespace_uri], but as a `CStr`
+    #[inline]
+    #[must_use]
+    pub fn namespace_uri_c_str(&self) -> &'static std::ffi::CStr {
+        self.ns.uri_c_str()
+    }
 }
 
 impl_serialize!(StartTag);