Skip to content

Use eprintln instead of println in bootstrap/compiletest/tidy #133817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Dec 4, 2024
Merged

Use eprintln instead of println in bootstrap/compiletest/tidy #133817

merged 3 commits into from
Dec 4, 2024

Conversation

clubby789
Copy link
Contributor

A big unconditional CTRL-F replace to start with to check if there's anything that CI expects to be on stdout

r? @jieyouxu

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Dec 3, 2024
jieyouxu
jieyouxu requested changes Dec 3, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I left some suggestions.

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 3, 2024
@clubby789 clubby789 marked this pull request as ready for review December 4, 2024 01:08
@rustbot
Copy link
Collaborator

rustbot commented Dec 4, 2024

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@clubby789 clubby789 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 4, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Dec 4, 2024 •
edited
Loading

Thanks! As usual, the only way to find out if any of these turns out somehow load-bearing is to merge it.
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 4, 2024

📌 Commit 8374f7c has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 4, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 4, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 4, 2024
@bors
Auto merge of rust-lang#133841 - matthiaskrgr:rollup-2snj3hc, r=matth…
733616f 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#133651 (Update `NonZero` and `NonNull` to not field-project (per MCP#807))
 - rust-lang#133764 (rustdoc: Rename `set_back_info` to `restore_module_data`.)
 - rust-lang#133784 (Fix MutVisitor's default implementations to visit Stmt's and BinOp's spans)
 - rust-lang#133798 (stop replacing bivariant args with `'static` when computing closure requirements)
 - rust-lang#133804 (Improve code for FileName retrieval in rustdoc)
 - rust-lang#133817 (Use `eprintln` instead of `println` in bootstrap/compiletest/tidy)

Failed merges:

 - rust-lang#133810 (remove unnecessary `eval_verify_bound`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0585134 into rust-lang:master Dec 4, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 4, 2024
@rust-timer
Unrolled build for rust-lang#133817
8b07dab 
Rollup merge of rust-lang#133817 - clubby789:bootstrap-eprintln, r=jieyouxu

Use `eprintln` instead of `println` in bootstrap/compiletest/tidy

A big unconditional CTRL-F replace to start with to check if there's anything that CI expects to be on stdout

r? `@jieyouxu`
@rustbot rustbot added this to the 1.85.0 milestone Dec 4, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Dec 4, 2024
Closed
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Dec 5, 2024
@jieyouxu
Revert "Rollup merge of rust-lang#133817 - clubby789:bootstrap-eprint…
5b75493 
…ln, r=jieyouxu"

This reverts commit 0585134, reversing
changes made to 5530869.

The PR unfortunately only converted the `ln!` instances, meaning that
test output was messed up because stdout/stderr output interleaved when
some `println!` instances were converted to `eprintln!` instances, while
some `println!` instances remain unchanged.
Zalathar added a commit to Zalathar/rust that referenced this pull request Dec 5, 2024
@Zalathar
Revert "Rollup merge of rust-lang#133817 - clubby789:bootstrap-eprint…
a6b2f45 
…ln, r=jieyouxu"

This reverts commit 0585134, reversing
changes made to 5530869.
@jieyouxu jieyouxu mentioned this pull request Dec 5, 2024
Merged
fmease added a commit to fmease/rust that referenced this pull request Dec 5, 2024
@fmease
Rollup merge of rust-lang#133892 - jieyouxu:revert-eprintln, r=jieyouxu
1f1dfd5 
Revert rust-lang#133817

This reverts commit 0585134, reversing changes made to 5530869.

rust-lang#133817 unfortunately only converted the `println!` instances to `eprintln!`, meaning that some test output (via compiletest/bootstrap) was messed up because stdout/stderr output interleaved improperly when some `println!` instances were converted to `eprintln!` instances, while some `print!` instances remain unchanged. This made reading test output annoying for contributors cc rust-lang#133879.

Closes rust-lang#133879 by reverting.

rust-lang#133817 can be relanded in the future when `print!` instances are also matched with `println!` instances.

cc `@clubby789`

This is a clean revert so I'm going to self-approve this PR.
@fmease fmease mentioned this pull request Dec 5, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 5, 2024
@bors
Auto merge of rust-lang#133893 - fmease:rollup-11pi6fg, r=fmease
0e98766 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#118833 (Add lint against function pointer comparisons)
 - rust-lang#122161 (Fix suggestion when shorthand `self` has erroneous type)
 - rust-lang#133233 (Add context to "const in pattern" errors)
 - rust-lang#133761 (Update books)
 - rust-lang#133843 (Do not emit empty suggestion)
 - rust-lang#133863 (Rename `core_pattern_type` and `core_pattern_types` lib feature  gates to `pattern_type_macro`)
 - rust-lang#133872 (No need to create placeholders for GAT args in confirm_object_candidate)
 - rust-lang#133874 (`fn_sig_for_fn_abi` should return a `ty::FnSig`, no need for a binder)
 - rust-lang#133890 (Add a new test ui/incoherent-inherent-impls/no-other-unrelated-errors to check E0116 does not cause unrelated errors)
 - rust-lang#133892 (Revert rust-lang#133817)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 5, 2024
@rust-timer
Unrolled build for rust-lang#133892
f8d58a1 
Rollup merge of rust-lang#133892 - jieyouxu:revert-eprintln, r=jieyouxu

Revert rust-lang#133817

This reverts commit 0585134, reversing changes made to 5530869.

rust-lang#133817 unfortunately only converted the `println!` instances to `eprintln!`, meaning that some test output (via compiletest/bootstrap) was messed up because stdout/stderr output interleaved improperly when some `println!` instances were converted to `eprintln!` instances, while some `print!` instances remain unchanged. This made reading test output annoying for contributors cc rust-lang#133879.

Closes rust-lang#133879 by reverting.

rust-lang#133817 can be relanded in the future when `print!` instances are also matched with `println!` instances.

cc `@clubby789`

This is a clean revert so I'm going to self-approve this PR.
@clubby789 clubby789 mentioned this pull request Dec 8, 2024
Merged
fmease added a commit to fmease/rust that referenced this pull request Dec 9, 2024
@fmease
Rollup merge of rust-lang#134040 - clubby789:bootstrap-eprintln, r=ji…
b282774 
…eyouxu

bootstrap: print{ln}! -> eprint{ln}! (take 2)

r? `@jieyouxu`

Reland of rust-lang#133817 with the `print!`s changed as well.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2024
@rust-timer
Unrolled build for rust-lang#134040
759c6e9 
Rollup merge of rust-lang#134040 - clubby789:bootstrap-eprintln, r=jieyouxu

bootstrap: print{ln}! -> eprint{ln}! (take 2)

r? `@jieyouxu`

Reland of rust-lang#133817 with the `print!`s changed as well.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu requested changes

Assignees

@jieyouxu jieyouxu

Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.
4 participants
@clubby789 @rustbot @jieyouxu @bors