From cdf12d2a85c5359270f1a3d7b744ea6214f0268c Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Fri, 6 Sep 2024 07:09:29 -0400
Subject: [PATCH] Update `rustc_version_cmd`

Change `if let` to a `match` because it is about the same complexity but
also works with our MSRV for 0.2. This should allow backporting [1]
easier, as well as future backports that touch this code.

Additionally, add some new documentation comments.

[1]: https://github.com/rust-lang/libc/pull/3893
---
 build.rs | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/build.rs b/build.rs
index 287fe9740589a..876db485e64ca 100644
--- a/build.rs
+++ b/build.rs
@@ -111,20 +111,23 @@ fn main() {
     }
 }
 
+/// Run `rustc --version` and capture the output, adjusting arguments as needed if `clippy-driver`
+/// is used instead.
 fn rustc_version_cmd(is_clippy_driver: bool) -> Output {
     let rustc_wrapper = env::var_os("RUSTC_WRAPPER").filter(|w| !w.is_empty());
     let rustc = env::var_os("RUSTC").expect("Failed to get rustc version: missing RUSTC env");
 
-    let mut cmd = if let Some(wrapper) = rustc_wrapper {
-        let mut cmd = Command::new(wrapper);
-        cmd.arg(rustc);
-        if is_clippy_driver {
-            cmd.arg("--rustc");
-        }
+    let mut cmd = match rustc_wrapper {
+        Some(wrapper) => {
+            let mut cmd = Command::new(wrapper);
+            cmd.arg(rustc);
+            if is_clippy_driver {
+                cmd.arg("--rustc");
+            }
 
-        cmd
-    } else {
-        Command::new(rustc)
+            cmd
+        }
+        None => Command::new(rustc),
     };
 
     cmd.arg("--version");
@@ -141,6 +144,8 @@ fn rustc_version_cmd(is_clippy_driver: bool) -> Output {
     output
 }
 
+/// Return the minor version of `rustc`, as well as a bool indicating whether or not the version
+/// is a nightly.
 fn rustc_minor_nightly() -> (u32, bool) {
     macro_rules! otry {
         ($e:expr) => {