From 3e901dbf0e9c378b80d9f525f4e30b07800cc256 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 3 Jan 2022 00:37:25 -0800
Subject: [PATCH] Simplify env var handling in build script

---
 build.rs | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/build.rs b/build.rs
index 946be6e2..c077cc6f 100644
--- a/build.rs
+++ b/build.rs
@@ -41,7 +41,6 @@
 //     1.57+.
 
 use std::env;
-use std::iter;
 use std::process::{self, Command};
 use std::str;
 
@@ -154,23 +153,17 @@ fn feature_allowed(feature: &str) -> bool {
 
     let flags_var;
     let flags_var_string;
-    let mut flags_var_split;
-    let mut flags_none;
-    let flags: &mut dyn Iterator<Item = &str> =
-        if let Some(encoded_rustflags) = env::var_os("CARGO_ENCODED_RUSTFLAGS") {
-            flags_var = encoded_rustflags;
-            flags_var_string = flags_var.to_string_lossy();
-            flags_var_split = flags_var_string.split('\x1f');
-            &mut flags_var_split
-        } else if let Some(rustflags) = env::var_os("RUSTFLAGS") {
-            flags_var = rustflags;
-            flags_var_string = flags_var.to_string_lossy();
-            flags_var_split = flags_var_string.split(' ');
-            &mut flags_var_split
-        } else {
-            flags_none = iter::empty();
-            &mut flags_none
-        };
+    let flags = if let Some(encoded_rustflags) = env::var_os("CARGO_ENCODED_RUSTFLAGS") {
+        flags_var = encoded_rustflags;
+        flags_var_string = flags_var.to_string_lossy();
+        flags_var_string.split('\x1f')
+    } else if let Some(rustflags) = env::var_os("RUSTFLAGS") {
+        flags_var = rustflags;
+        flags_var_string = flags_var.to_string_lossy();
+        flags_var_string.split(' ')
+    } else {
+        return true;
+    };
 
     for mut flag in flags {
         if flag.starts_with("-Z") {