modify when we read file

Author: Shunpoco

src/bootstrap/src/core/build_steps/run.rs

@@ -14,7 +14,7 @@ use crate::core::build_steps::tool::{self, RustcPrivateCompilers, SourceType, To
 use crate::core::build_steps::vendor::{Vendor, default_paths_to_vendor};
 use crate::core::builder::{Builder, Kind, RunConfig, ShouldRun, Step, StepMetadata};
 use crate::core::config::TargetSelection;
-use crate::core::config::flags::{get_completion, get_help};
+use crate::core::config::flags::{get_completion, top_level_help};
 use crate::utils::exec::command;
 use crate::{Mode, t};
 
@@ -514,11 +514,10 @@ impl Step for GenerateHelp {
     type Output = ();
 
     fn run(self, builder: &Builder<'_>) {
+        let help = top_level_help();
         let path = get_help_path(builder);
-        if let Some(help) = get_help(&path) {
-            std::fs::write(&path, help)
-                .unwrap_or_else(|e| panic!("writing help into {} failed: {e:?}", path.display()));
-        }
+        std::fs::write(&path, help)
+            .unwrap_or_else(|e| panic!("writing help into {} failed: {e:?}", path.display()));
     }
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {

src/bootstrap/src/core/build_steps/test.rs

@@ -28,7 +28,7 @@ use crate::core::builder::{
     crate_description,
 };
 use crate::core::config::TargetSelection;
-use crate::core::config::flags::{Subcommand, get_completion, get_help};
+use crate::core::config::flags::{Subcommand, get_completion, top_level_help};
 use crate::utils::build_stamp::{self, BuildStamp};
 use crate::utils::exec::{BootstrapCommand, command};
 use crate::utils::helpers::{
@@ -1295,12 +1295,20 @@ HELP: to skip test's attempt to check tidiness, pass `--skip src/tools/tidy` to
         }
 
         builder.info("x.py help check");
-        let help_path = get_help_path(builder);
         if builder.config.cmd.bless() {
             builder.ensure(crate::core::build_steps::run::GenerateHelp);
-        } else if get_help(&help_path).is_some() {
-            eprintln!("x.py help was changed; run `x.py run generate-help` to update them");
-            crate::exit!(1);
+        } else {
+            let help_path = get_help_path(builder);
+            let cur_help = std::fs::read_to_string(&help_path).unwrap_or_else(|err| {
+                eprintln!("couldn't read {}: {}", help_path.display(), err.to_string());
+                crate::exit!(1);
+            });
+            let new_help = top_level_help();
+
+            if new_help != cur_help {
+                eprintln!("x.py help was changed; run `x.py run generate-help` to update it");
+                crate::exit!(1);
+            }
         }
     }
 

src/bootstrap/src/core/config/flags.rs

@@ -702,24 +702,8 @@ pub fn get_completion(shell: &dyn Generator, path: &Path) -> Option<String> {
     Some(String::from_utf8(buf).expect("completion script should be UTF-8"))
 }
 
-/// Return the help of the bootstrap if the result differs from the current
-/// help in `path`. It always returns the help if `path` does not exist.
-pub fn get_help(path: &Path) -> Option<String> {
+/// Return the top level help of the bootstrap.
+pub fn top_level_help() -> String {
     let mut cmd = Flags::command();
-    let cur_help = if !path.exists() {
-        String::new()
-    } else {
-        std::fs::read_to_string(path).unwrap_or_else(|_| {
-            eprintln!("couldn't read {}", path.display());
-            crate::exit!(1)
-        })
-    };
-
-    let new_help = cmd.render_help();
-
-    if new_help.to_string() == cur_help {
-        return None;
-    }
-
-    Some(new_help.to_string())
+    cmd.render_help().to_string()
 }