refactor: use process_group(0) and consolidate shutdown logic

Author: Madoshakalaka

examples/function_router/src/components/pagination.rs

@@ -131,12 +131,12 @@ pub fn Links(props: &Props) -> Html {
         page, total_pages, ..
     } = *props;
 
-    let pages_prev = page.checked_sub(1).unwrap_or_default() as usize;
+    let pages_prev = page.saturating_sub(1) as usize;
     let pages_next = (total_pages - page) as usize;
 
     let links_left = LINKS_PER_SIDE.min(pages_prev)
             // if there are less than `LINKS_PER_SIDE` to the right, we add some more on the left.
-            + LINKS_PER_SIDE.checked_sub(pages_next).unwrap_or_default();
+            + LINKS_PER_SIDE.saturating_sub(pages_next);
     let links_right = 2 * LINKS_PER_SIDE - links_left;
 
     html! {

examples/keyed_list/src/main.rs

@@ -107,7 +107,7 @@ impl Component for App {
             }
             Msg::SortById => {
                 self.persons
-                    .sort_unstable_by(|a, b| a.info().id.cmp(&b.info().id));
+                    .sort_unstable_by_key(|a| a.info().id);
                 true
             }
             Msg::SortByName => {

examples/router/src/components/pagination.rs

@@ -95,12 +95,12 @@ impl Pagination {
             page, total_pages, ..
         } = *props;
 
-        let pages_prev = page.checked_sub(1).unwrap_or_default() as usize;
+        let pages_prev = page.saturating_sub(1) as usize;
         let pages_next = (total_pages - page) as usize;
 
         let links_left = LINKS_PER_SIDE.min(pages_prev)
             // if there are less than `LINKS_PER_SIDE` to the right, we add some more on the left.
-            + LINKS_PER_SIDE.checked_sub(pages_next).unwrap_or_default();
+            + LINKS_PER_SIDE.saturating_sub(pages_next);
         let links_right = 2 * LINKS_PER_SIDE - links_left;
 
         html! {

packages/yew-macro/src/html_tree/tag.rs

@@ -107,15 +107,14 @@ impl TagTokens {
             let next = input.parse()?;
             if let TokenTree::Punct(punct) = &next {
                 match punct.as_char() {
-                    '/' => {
-                        if angle_count == 1 && input.peek(Token![>]) {
+                    '/'
+                        if angle_count == 1 && input.peek(Token![>]) => {
                             div = Some(syn::token::Slash {
                                 spans: [punct.span()],
                             });
                             gt = input.parse()?;
                             break;
                         }
-                    }
                     '>' => {
                         angle_count = angle_count.checked_sub(1).ok_or_else(|| {
                             syn::Error::new_spanned(

packages/yew/src/dom_bundle/btag/mod.rs

@@ -175,8 +175,8 @@ impl Reconcilable for VTag {
         match bundle {
             // If the ancestor is a tag of the same type, don't recreate, keep the
             // old tag and update its attributes and children.
-            BNode::Tag(ex) if self.key == ex.key => {
-                if match (&self.inner, &ex.inner) {
+            BNode::Tag(ex) if self.key == ex.key
+                && match (&self.inner, &ex.inner) {
                     (VTagInner::Input(_), BTagInner::Input(_)) => true,
                     (VTagInner::Textarea { .. }, BTagInner::Textarea { .. }) => true,
                     (VTagInner::Other { tag: l, .. }, BTagInner::Other { tag: r, .. })
@@ -185,10 +185,9 @@ impl Reconcilable for VTag {
                         true
                     }
                     _ => false,
-                } {
+                } => {
                     return self.reconcile(root, parent_scope, parent, slot, ex.deref_mut());
                 }
-            }
             _ => {}
         };
         self.replace(root, parent_scope, parent, slot, bundle)

tools/ssr-e2e/src/main.rs

@@ -2,7 +2,7 @@ use std::process::ExitCode;
 use std::time::Duration;
 
 use clap::Parser;
-use tokio::process::Command;
+use tokio::process::{Child, Command};
 use tokio::time::{sleep, Instant};
 
 #[derive(Parser)]
@@ -88,15 +88,24 @@ async fn wait_for_server(url: &str, timeout: Duration) -> bool {
     false
 }
 
-#[cfg(unix)]
-fn kill_process_group(id: u32) {
-    unsafe {
-        libc::kill(-(id as i32), libc::SIGTERM);
+/// Terminates the server and all its descendant processes.
+///
+/// The server is started via `sh -c "..."`, producing a process tree
+/// (sh -> cargo run -> server binary). `Child::kill()` alone would only
+/// kill `sh`, orphaning the actual server process on the port. On Unix we
+/// use process groups (set up via `process_group(0)` at spawn time) so a
+/// single `kill(-pgid, SIGTERM)` reaches the entire tree.
+fn shutdown_server(server: &mut Child) {
+    #[cfg(unix)]
+    if let Some(id) = server.id() {
+        unsafe {
+            libc::kill(-(id as i32), libc::SIGTERM);
+        }
+        return;
     }
-}
 
-#[cfg(not(unix))]
-fn kill_process_group(_id: u32) {}
+    let _ = server.start_kill();
+}
 
 #[tokio::main]
 async fn main() -> ExitCode {
@@ -116,17 +125,10 @@ async fn main() -> ExitCode {
         cmd.stdout(std::process::Stdio::inherit());
         cmd.stderr(std::process::Stdio::inherit());
         #[cfg(unix)]
-        unsafe {
-            cmd.pre_exec(|| {
-                libc::setpgid(0, 0);
-                Ok(())
-            });
-        }
+        cmd.process_group(0);
         cmd.spawn().expect("failed to start server process")
     };
 
-    let server_pid = server.id().expect("server has no pid");
-
     eprintln!("[ssr-e2e] Waiting for server at {} ...", args.health_url);
 
     let ready = wait_for_server(&args.health_url, Duration::from_secs(args.timeout)).await;
@@ -135,7 +137,7 @@ async fn main() -> ExitCode {
             "[ssr-e2e] Server did not become ready within {}s",
             args.timeout
         );
-        kill_process_group(server_pid);
+        shutdown_server(&mut server);
         let _ = server.wait().await;
         return ExitCode::FAILURE;
     }
@@ -159,7 +161,7 @@ async fn main() -> ExitCode {
         .await;
 
     eprintln!("[ssr-e2e] Shutting down server ...");
-    kill_process_group(server_pid);
+    shutdown_server(&mut server);
     let _ = server.wait().await;
 
     match test_result {