Rollup merge of #134207 - jieyouxu:revert-134040, r=lqd

Revert "bootstrap: print{ln}! -> eprint{ln}! (take 2) #134040"
Unfortunately, #134040 is proving to have caused more output interleaving problems that are tricky to diagnose and fix, and I think we probably should leave these untouched as bootstrap and compiletest has a bunch of interconnecting parts, and the commands and tools that they exercise do not consistently use stderr/stdout either. This causes hard-to-diagnose output interleaving bugs, which unfortunately degrades contributor experience.
This PR reverts two PRs in order to cleanly revert #134040:
1. Revert #134123 which is a fix-forward after #134040.
2. Revert #134040 itself.
I don't regret the initial effort `@clubby789,` and thank you for making the attempts, but I think we need to refrain from touching too many of these at once because some of the interleaving are very non-obvious and we don't have test coverage for.
r? `@clubby789`
cc `@Zalathar`

Author: matthiaskrgr

src/bootstrap/src/bin/main.rs

@@ -48,9 +48,9 @@ fn main() {
  err => {
 drop(err);
 ifletOk(pid) = pid {
-eprintln!("WARNING: build directory locked by process {pid}, waiting for lock");
+println!("WARNING: build directory locked by process {pid}, waiting for lock");
 }else{
-eprintln!("WARNING: build directory locked, waiting for lock");
+println!("WARNING: build directory locked, waiting for lock");
 }
 letmut lock = t!(build_lock.write());
 t!(lock.write(process::id().to_string().as_ref()));
@@ -70,13 +70,13 @@ fn main() {
 // changelog warning, not the `x.py setup` message.
 let suggest_setup = config.config.is_none() && !matches!(config.cmd,Subcommand::Setup{ .. });
 if suggest_setup {
-eprintln!("WARNING: you have not made a `config.toml`");
-eprintln!(
+println!("WARNING: you have not made a `config.toml`");
+println!(
 "HELP: consider running `./x.py setup` or copying `config.example.toml` by running \
  `cp config.example.toml config.toml`"
 );
 }elseifletSome(suggestion) = &changelog_suggestion {
-eprintln!("{suggestion}");
+println!("{suggestion}");
 }
 
 let pre_commit = config.src.join(".git").join("hooks").join("pre-commit");
@@ -86,13 +86,13 @@ fn main() {
 Build::new(config).build();
 
 if suggest_setup {
-eprintln!("WARNING: you have not made a `config.toml`");
-eprintln!(
+println!("WARNING: you have not made a `config.toml`");
+println!(
 "HELP: consider running `./x.py setup` or copying `config.example.toml` by running \
  `cp config.example.toml config.toml`"
 );
 }elseifletSome(suggestion) = &changelog_suggestion {
-eprintln!("{suggestion}");
+println!("{suggestion}");
 }
 
 // Give a warning if the pre-commit script is in pre-commit and not pre-push.
@@ -102,14 +102,14 @@ fn main() {
 if fs::read_to_string(pre_commit).is_ok_and(|contents| {
  contents.contains("https://github.com/rust-lang/rust/issues/77620#issuecomment-705144570")
 }){
-eprintln!(
+println!(
 "WARNING: You have the pre-push script installed to .git/hooks/pre-commit. \
  Consider moving it to .git/hooks/pre-push instead, which runs less often."
 );
 }
 
 if suggest_setup || changelog_suggestion.is_some(){
-eprintln!("NOTE: this message was printed twice to make it more likely to be seen");
+println!("NOTE: this message was printed twice to make it more likely to be seen");
 }
 
 if dump_bootstrap_shims {

src/bootstrap/src/bin/rustc.rs

@@ -306,7 +306,7 @@ fn main() {
 // should run on success, after this block.
 }
 if verbose > 0{
-eprintln!("\nDid not run successfully: {status}\n{cmd:?}\n-------------");
+println!("\nDid not run successfully: {status}\n{cmd:?}\n-------------");
 }
 
 ifletSome(mut on_fail) = on_fail {

src/bootstrap/src/core/build_steps/check.rs

@@ -287,7 +287,7 @@ impl Step for CodegenBackend {
 fnrun(self,builder:&Builder<'_>){
 // FIXME: remove once https://github.com/rust-lang/rust/issues/112393 is resolved
 if builder.build.config.vendor && self.backend == "gcc"{
-eprintln!("Skipping checking of `rustc_codegen_gcc` with vendoring enabled.");
+println!("Skipping checking of `rustc_codegen_gcc` with vendoring enabled.");
 return;
 }
 

src/bootstrap/src/core/build_steps/compile.rs

@@ -1611,7 +1611,7 @@ impl Step for Sysroot {
 let sysroot = sysroot_dir(compiler.stage);
 
  builder
-.verbose(|| eprintln!("Removing sysroot {} to avoid caching bugs", sysroot.display()));
+.verbose(|| println!("Removing sysroot {} to avoid caching bugs", sysroot.display()));
 let _ = fs::remove_dir_all(&sysroot);
 t!(fs::create_dir_all(&sysroot));
 
@@ -1681,7 +1681,7 @@ impl Step for Sysroot {
 returntrue;
 }
 if !filtered_files.iter().all(|f| f != path.file_name().unwrap()){
- builder.verbose_than(1, || eprintln!("ignoring {}", path.display()));
+ builder.verbose_than(1, || println!("ignoring {}", path.display()));
 false
 }else{
 true
@@ -2240,7 +2240,7 @@ pub fn stream_cargo(
  cargo.arg(arg);
 }
 
- builder.verbose(|| eprintln!("running: {cargo:?}"));
+ builder.verbose(|| println!("running: {cargo:?}"));
 
 if builder.config.dry_run(){
 returntrue;
@@ -2266,7 +2266,7 @@ pub fn stream_cargo(
 cb(msg)
 }
 // If this was informational, just print it out and continue
-Err(_) => eprintln!("{line}"),
+Err(_) => println!("{line}"),
 }
 }
 

src/bootstrap/src/core/build_steps/dist.rs

@@ -2080,7 +2080,7 @@ fn maybe_install_llvm(
 {
 letmut cmd = command(llvm_config);
  cmd.arg("--libfiles");
- builder.verbose(|| eprintln!("running {cmd:?}"));
+ builder.verbose(|| println!("running {cmd:?}"));
 let files = cmd.run_capture_stdout(builder).stdout();
 let build_llvm_out = &builder.llvm_out(builder.config.build);
 let target_llvm_out = &builder.llvm_out(target);

src/bootstrap/src/core/build_steps/format.rs

@@ -107,10 +107,10 @@ fn print_paths(verb: &str, adjective: Option<&str>, paths: &[String]) {
 ifletSome(adjective) = adjective {format!("{adjective} ")}else{String::new()};
 if len <= 10{
 for path in paths {
-eprintln!("fmt: {verb} {adjective}file {path}");
+println!("fmt: {verb} {adjective}file {path}");
 }
 }else{
-eprintln!("fmt: {verb} {len} {adjective}files");
+println!("fmt: {verb} {len} {adjective}files");
 }
 }
 
@@ -199,7 +199,7 @@ pub fn format(build: &Builder<'_>, check: bool, all: bool, paths: &[PathBuf]) {
 matchget_modified_rs_files(build){
 Ok(Some(files)) => {
 if files.is_empty(){
-eprintln!("fmt info: No modified files detected for formatting.");
+println!("fmt info: No modified files detected for formatting.");
 return;
 }
 

src/bootstrap/src/core/build_steps/setup.rs

@@ -134,7 +134,7 @@ impl Step for Profile {
 t!(fs::remove_file(path));
 }
  _ => {
-eprintln!("Exiting.");
+println!("Exiting.");
 crate::exit!(1);
 }
 }
@@ -184,15 +184,15 @@ pub fn setup(config: &Config, profile: Profile) {
 Profile::Dist => &["dist","build"],
 };
 
-eprintln!();
+println!();
 
-eprintln!("To get started, try one of the following commands:");
+println!("To get started, try one of the following commands:");
 for cmd in suggestions {
-eprintln!("- `x.py {cmd}`");
+println!("- `x.py {cmd}`");
 }
 
 if profile != Profile::Dist{
-eprintln!(
+println!(
 "For more suggestions, see https://rustc-dev-guide.rust-lang.org/building/suggested.html"
 );
 }
@@ -224,7 +224,7 @@ fn setup_config_toml(path: &PathBuf, profile: Profile, config: &Config) {
 t!(fs::write(path, settings));
 
 let include_path = profile.include_path(&config.src);
-eprintln!("`x.py` will now use the configuration at {}", include_path.display());
+println!("`x.py` will now use the configuration at {}", include_path.display());
 }
 
 /// Creates a toolchain link for stage1 using `rustup`
@@ -256,7 +256,7 @@ impl Step for Link {
 }
 
 if !rustup_installed(builder){
-eprintln!("WARNING: `rustup` is not installed; Skipping `stage1` toolchain linking.");
+println!("WARNING: `rustup` is not installed; Skipping `stage1` toolchain linking.");
 return;
 }
 
@@ -296,7 +296,7 @@ fn attempt_toolchain_link(builder: &Builder<'_>, stage_path: &str) {
 }
 
 iftry_link_toolchain(builder, stage_path){
-eprintln!(
+println!(
 "Added `stage1` rustup toolchain; try `cargo +stage1 build` on a separate rust project to run a newly-built toolchain"
 );
 }else{
@@ -321,14 +321,14 @@ fn toolchain_is_linked(builder: &Builder<'_>) -> bool {
 returnfalse;
 }
 // The toolchain has already been linked.
-eprintln!(
+println!(
 "`stage1` toolchain already linked; not attempting to link `stage1` toolchain"
 );
 }
 None => {
 // In this case, we don't know if the `stage1` toolchain has been linked;
 // but `rustup` failed, so let's not go any further.
-eprintln!(
+println!(
 "`rustup` failed to list current toolchains; not attempting to link `stage1` toolchain"
 );
 }
@@ -389,12 +389,12 @@ pub fn interactive_path() -> io::Result<Profile> {
  input.parse()
 }
 
-eprintln!("Welcome to the Rust project! What do you want to do with x.py?");
+println!("Welcome to the Rust project! What do you want to do with x.py?");
 for((letter, _), profile)inabbrev_all(){
-eprintln!("{}) {}: {}", letter, profile, profile.purpose());
+println!("{}) {}: {}", letter, profile, profile.purpose());
 }
 let template = loop{
-eprint!(
+print!(
 "Please choose one ({}): ",
  abbrev_all().map(|((l, _), _)| l).collect::<Vec<_>>().join("/")
 );
@@ -428,7 +428,7 @@ enum PromptResult {
 fnprompt_user(prompt:&str) -> io::Result<Option<PromptResult>>{
 letmut input = String::new();
 loop{
-eprint!("{prompt} ");
+print!("{prompt} ");
  io::stdout().flush()?;
  input.clear();
  io::stdin().read_line(&mut input)?;
@@ -490,15 +490,15 @@ fn install_git_hook_maybe(builder: &Builder<'_>, config: &Config) -> io::Result<
 returnOk(());
 }
 
-eprintln!(
+println!(
 "\nRust's CI will automatically fail if it doesn't pass `tidy`, the internal tool for ensuring code quality.
 If you'd like, x.py can install a git hook for you that will automatically run `test tidy` before
 pushing your code to ensure your code is up to par. If you decide later that this behavior is
 undesirable, simply delete the `pre-push` file from .git/hooks."
 );
 
 ifprompt_user("Would you like to install the git hook?: [y/N]")? != Some(PromptResult::Yes){
-eprintln!("Ok, skipping installation!");
+println!("Ok, skipping installation!");
 returnOk(());
 }
 if !hooks_dir.exists(){
@@ -515,7 +515,7 @@ undesirable, simply delete the `pre-push` file from .git/hooks."
 );
 returnErr(e);
 }
-Ok(_) => eprintln!("Linked `src/etc/pre-push.sh` to `.git/hooks/pre-push`"),
+Ok(_) => println!("Linked `src/etc/pre-push.sh` to `.git/hooks/pre-push`"),
 };
 Ok(())
 }
@@ -541,7 +541,7 @@ Select which editor you would like to set up [default: None]: ";
 
 letmut input = String::new();
 loop{
-eprint!("{}", prompt_str);
+print!("{}", prompt_str);
  io::stdout().flush()?;
  input.clear();
  io::stdin().read_line(&mut input)?;
@@ -656,7 +656,7 @@ impl Step for Editor {
 ifletSome(editor_kind) = editor_kind {
 while !t!(create_editor_settings_maybe(config, editor_kind.clone())){}
 }else{
-eprintln!("Ok, skipping editor setup!");
+println!("Ok, skipping editor setup!");
 }
 }
 Err(e) => eprintln!("Could not determine the editor: {e}"),
@@ -689,7 +689,7 @@ fn create_editor_settings_maybe(config: &Config, editor: EditorKind) -> io::Resu
  mismatched_settings = Some(false);
 }
 }
-eprintln!(
+println!(
 "\nx.py can automatically install the recommended `{settings_filename}` file for rustc development"
 );
 
@@ -708,7 +708,7 @@ fn create_editor_settings_maybe(config: &Config, editor: EditorKind) -> io::Resu
 Some(PromptResult::Yes) => true,
 Some(PromptResult::Print) => false,
  _ => {
-eprintln!("Ok, skipping settings!");
+println!("Ok, skipping settings!");
 returnOk(true);
 }
 };
@@ -735,9 +735,9 @@ fn create_editor_settings_maybe(config: &Config, editor: EditorKind) -> io::Resu
  _ => "Created",
 };
  fs::write(&settings_path, editor.settings_template())?;
-eprintln!("{verb} `{}`", settings_filename);
+println!("{verb} `{}`", settings_filename);
 }else{
-eprintln!("\n{}", editor.settings_template());
+println!("\n{}", editor.settings_template());
 }
 Ok(should_create)
 }

src/bootstrap/src/core/build_steps/suggest.rs

@@ -66,6 +66,6 @@ pub fn suggest(builder: &Builder<'_>, run: bool) {
  build.build();
 }
 }else{
-eprintln!("HELP: consider using the `--run` flag to automatically run suggested tests");
+println!("HELP: consider using the `--run` flag to automatically run suggested tests");
 }
 }

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

@@ -471,11 +471,11 @@ impl Miri {
 // We re-use the `cargo` from above.
  cargo.arg("--print-sysroot");
 
- builder.verbose(|| eprintln!("running: {cargo:?}"));
+ builder.verbose(|| println!("running: {cargo:?}"));
 let stdout = cargo.run_capture_stdout(builder).stdout();
 // Output is "<sysroot>\n".
 let sysroot = stdout.trim_end();
- builder.verbose(|| eprintln!("`cargo miri setup --print-sysroot` said: {sysroot:?}"));
+ builder.verbose(|| println!("`cargo miri setup --print-sysroot` said: {sysroot:?}"));
 PathBuf::from(sysroot)
 }
 }
@@ -2488,7 +2488,7 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->
 }
 }
 
- builder.verbose(|| eprintln!("doc tests for: {}", markdown.display()));
+ builder.verbose(|| println!("doc tests for: {}", markdown.display()));
 letmut cmd = builder.rustdoc_cmd(compiler);
  builder.add_rust_test_threads(&mut cmd);
 // allow for unstable options such as new editions

src/bootstrap/src/core/builder/cargo.rs

@@ -523,7 +523,7 @@ impl Builder<'_> {
 
 let sysroot_str = sysroot.as_os_str().to_str().expect("sysroot should be UTF-8");
 ifself.is_verbose() && !matches!(self.config.dry_run,DryRun::SelfCheck){
-eprintln!("using sysroot {sysroot_str}");
+println!("using sysroot {sysroot_str}");
 }
 
 letmut rustflags = Rustflags::new(target);