From d793f80bd4ceb85c032e18c1d0badac9a8664bba Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Thu, 23 Nov 2023 16:09:11 +0100
Subject: [PATCH] Correctly pass `cfg` option

---
 build_system/src/test.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/build_system/src/test.rs b/build_system/src/test.rs
index e175b62625cb..614042b36c20 100644
--- a/build_system/src/test.rs
+++ b/build_system/src/test.rs
@@ -390,7 +390,7 @@ fn std_tests(env: &Env, args: &TestArg) -> Result<(), String> {
         &args.config_info.target_triple,
     ]);
     if !args.no_default_features {
-        command.push(&"--cfg feature=\"master\"");
+        command.extend_from_slice(&[&"--cfg", &"feature=\"master\""]);
     }
     run_command_with_env(&command, None, Some(env))?;
 
@@ -454,7 +454,7 @@ fn std_tests(env: &Env, args: &TestArg) -> Result<(), String> {
         &args.config_info.target_triple,
     ]);
     if !args.no_default_features {
-        command.push(&"--cfg feature=\"master\"");
+        command.extend_from_slice(&[&"--cfg", &"feature=\"master\""]);
     }
     run_command_with_env(&command, None, Some(env))?;
     run_command_in_vm(
@@ -1085,8 +1085,9 @@ fn test_successful_rustc(env: &Env, args: &TestArg) -> Result<(), String> {
                 .filter(|line| !line.is_empty())
             {
                 let path = Path::new("rust").join(file);
-                std::fs::remove_file(&path)
-                    .map_err(|error| format!("failed to remove `{}`: {:?}", path.display(), error))?;
+                std::fs::remove_file(&path).map_err(|error| {
+                    format!("failed to remove `{}`: {:?}", path.display(), error)
+                })?;
             }
         } else {
             println!(