Skip to content
New issue

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

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

Already on GitHub? # to your account

Revert #133817 #133892

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Revert #133817 #133892

merged 1 commit into from
Dec 5, 2024

Conversation

jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented Dec 5, 2024

This reverts commit 0585134, reversing changes made to 5530869.

#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 #133879.

Closes #133879 by reverting.

#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.

…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.
@rustbot
Copy link
Collaborator

rustbot commented Dec 5, 2024

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 5, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 5, 2024

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

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

@jieyouxu
Copy link
Member Author

jieyouxu commented Dec 5, 2024

@bors r+ rollup
@bors p=10 (for contributor experience)

@bors
Copy link
Contributor

bors commented Dec 5, 2024

📌 Commit 5b75493 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 5, 2024
@fmease
Copy link
Member

fmease commented Dec 5, 2024

I'll put this revert PR "into my size-7 rollup" by forming a size-8 one to avoid the queue becoming bigger & bigger, is that alright?

@jieyouxu
Copy link
Member Author

jieyouxu commented Dec 5, 2024

I'll put this revert PR "into my size-7 rollup" by forming a size-8 one to avoid the queue becoming bigger & bigger, is that alright?

Yes, sounds good

bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 5, 2024
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
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.
@bors bors merged commit 1f1dfd5 into rust-lang:master Dec 5, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 5, 2024
@bors
Copy link
Contributor

bors commented Dec 5, 2024

⌛ Testing commit 5b75493 with merge 0e98766...

@jieyouxu jieyouxu deleted the revert-eprintln branch December 5, 2024 09:57
# for free to join this conversation on GitHub. Already have an account? # to comment
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
Development

Successfully merging this pull request may close these issues.

compiletest output newlines are weird
5 participants