fix(console): remove trailing semicolons from macro expansions

crates/console/src/console_dbg.rs

@@ -9,7 +9,7 @@ macro_rules! console {
         $crate::log!(
             ::std::format!("%c[{}:{}] ", ::std::file!(), ::std::line!()),
             "font-weight: bold"
-        );
+        )
     };
     ($val:expr $(,)?) => {
         {

crates/console/src/macros.rs

@@ -2,23 +2,23 @@
 #[macro_export]
 macro_rules! clear {
     () => {
-        $crate::externs::clear();
+        $crate::externs::clear()
     };
 }
 
 /// Calls `console.assert()`
 #[macro_export]
 macro_rules! assert {
     ($assertion:expr, $($arg:expr),+) => {
-       $crate::externs::assert($assertion, ::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]));
+       $crate::externs::assert($assertion, ::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]))
     }
 }
 
 /// Calls `console.debug()`
 #[macro_export]
 macro_rules! debug {
     ($($arg:expr),+) => {
-       $crate::externs::debug(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]));
+       $crate::externs::debug(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]))
     }
 }
 
@@ -32,7 +32,7 @@ macro_rules! debug {
 #[macro_export]
 macro_rules! dir {
     ($arg:expr) => {
-        $crate::externs::dir(&$crate::__macro::JsValue::from($arg));
+        $crate::externs::dir(&$crate::__macro::JsValue::from($arg))
     };
 }
 
@@ -46,15 +46,15 @@ macro_rules! dir {
 #[macro_export]
 macro_rules! dirxml {
     ($arg:expr) => {
-        $crate::externs::dirxml(&$crate::__macro::JsValue::from($arg));
+        $crate::externs::dirxml(&$crate::__macro::JsValue::from($arg))
     };
 }
 
 /// Calls `console.error()`
 #[macro_export]
 macro_rules! error {
     ($($arg:expr),+) => {
-       $crate::externs::error(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]));
+       $crate::externs::error(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]))
     }
 }
 
@@ -64,26 +64,26 @@ macro_rules! error {
 #[macro_export]
 macro_rules! group {
     ($($arg:expr),+) => {
-       $crate::externs::group(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]));
+       $crate::externs::group(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]))
     };
     (collapsed $($arg:expr),+) => {
-       $crate::externs::group_collapsed(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]));
+       $crate::externs::group_collapsed(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]))
     };
 }
 
 /// Calls `console.groupEnd()`
 #[macro_export]
 macro_rules! group_end {
     () => {
-        $crate::externs::group_end();
+        $crate::externs::group_end()
     };
 }
 
 /// Calls `console.info()`
 #[macro_export]
 macro_rules! info {
     ($($arg:expr),+) => {
-       $crate::externs::info(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]));
+       $crate::externs::info(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]))
     }
 }
 
@@ -97,33 +97,58 @@ macro_rules! info {
 #[macro_export]
 macro_rules! table {
     ($data:expr) => {
-        $crate::externs::table_with_data($crate::__macro::JsValue::from($data));
+        $crate::externs::table_with_data($crate::__macro::JsValue::from($data))
     };
     ($data:expr, $columns:expr) => {
-        $crate::__macro::table_with_data_and_columns($data, $columns);
+        $crate::__macro::table_with_data_and_columns($data, $columns)
     };
 }
 
 /// Calls `console.log()`
 #[macro_export]
 macro_rules! log {
     ($($arg:expr),+) => {
-       $crate::externs::log(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]));
+       $crate::externs::log(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]))
     }
 }
 
 /// Calls `console.trace()`
 #[macro_export]
 macro_rules! trace {
     ($($arg:expr),+) => {
-       $crate::externs::trace(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]));
+       $crate::externs::trace(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]))
     }
 }
 
 /// Calls `console.warn()`
 #[macro_export]
 macro_rules! warn {
     ($($arg:expr),+) => {
-       $crate::externs::warn(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]));
+       $crate::externs::warn(::std::boxed::Box::from([$($crate::__macro::JsValue::from($arg),)+]))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    #![allow(dead_code)]
+    //! These exist to ensure macros compile in expression position
+    //! (no trailing semicolon in the expansion, see rust-lang/rust#79813)
+
+    fn expression_position_works() {
+        let _: () = crate::clear!();
+        let _: () = crate::assert!(true, "msg");
+        let _: () = crate::debug!("debug");
+        let _: () = crate::dir!("dir");
+        let _: () = crate::dirxml!("dirxml");
+        let _: () = crate::error!("error");
+        let _: () = crate::group!("group");
+        let _: () = crate::group!(collapsed "group");
+        let _: () = crate::group_end!();
+        let _: () = crate::info!("info");
+        let _: () = crate::table!(crate::__macro::JsValue::from("data"));
+        let _: () = crate::log!("log");
+        let _: () = crate::trace!("trace");
+        let _: () = crate::warn!("warn");
+        let _: () = crate::console!();
     }
 }

crates/history/src/state.rs

@@ -51,13 +51,9 @@ pub(crate) fn extract_state(raw: JsValue) -> (Option<u32>, Option<JsValue>) {
     let id = Some(history_state.id());
 
     let key = JsValue::from_str("state");
-    let user_state = js_sys::Reflect::get(&raw, &key).ok().and_then(|v| {
-        if v.is_undefined() || v.is_null() {
-            None
-        } else {
-            Some(v)
-        }
-    });
+    let user_state = js_sys::Reflect::get(&raw, &key)
+        .ok()
+        .filter(|v| !(v.is_undefined() || v.is_null()));
 
     (id, user_state)
 }