rust (original) (raw)

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.

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

Already on GitHub?Sign in to your account

Conversation11 Commits2 Checks6 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

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 8, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

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

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

This comment was marked as resolved.

Rebased to fix merge conflict, no functional changes.

Co-authored-by: Jieyou Xu jieyouxu@outlook.com

Fixed a missing conversion in compiletest

                 if self.config.mode == crate::common::Mode::Ui {

                   println!("note: by default, ui tests are expected not to compile");

                   eprintln!("note: by default, ui tests are expected not to compile");
               }

Choose a reason for hiding this comment

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

Thanks! I did some local testing

./x clean: OK
Basic compiler flow: ./x build library: OK
Library test flow: ./x test library/alloc: OK
Check compiler flow: ./x check compiler: OK
Stage 1 ui test flow (no changes): OK
Stage 1 ui test failure flow: OK
- stderr diff changed: OK
- rebless: OK
Stage 1 run-make: OK
./x run src/tools/unicode-table-generator/: OK

AFAICT this looks fine to me.

📌 Commit a6c4628 has been approved by jieyouxu

It is now in the queue for this repository.

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 9, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request

Dec 10, 2024

Rollup of 9 pull requests

Successful merges:

rust-lang#133996 (Move most tests for -l and #[link(..)] into tests/ui/link-native-libs)
rust-lang#134012 (Grammar fixes)
rust-lang#134032 (docs: better examples for std::ops::ControlFlow)
rust-lang#134040 (bootstrap: print{ln}! -> eprint{ln}! (take 2))
rust-lang#134043 (Add test to check unicode identifier version)
rust-lang#134053 (rustdoc: rename issue-\d+.rs tests to have meaningful names (part 10))
rust-lang#134055 (interpret: clean up deduplicating allocation functions)
rust-lang#134073 (dataflow_const_prop: do not eval a ptr address in SwitchInt)
rust-lang#134084 (Fix typo in RFC mention 3598 -> 3593)

r? @ghost @rustbot modify labels: rollup

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request

Dec 10, 2024

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.

fmease added a commit to fmease/rust that referenced this pull request

Dec 10, 2024

…lubby789

bootstrap: Forward cargo JSON output to stdout, not stderr

This fixes the RA errors I've been seeing on proc-macros after the re-landing of rust-lang#134040.

r? clubby789

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request

Dec 10, 2024

Rollup merge of rust-lang#134123 - Zalathar:json-output, r=jieyouxu,clubby789

bootstrap: Forward cargo JSON output to stdout, not stderr

This fixes the RA errors I've been seeing on proc-macros after the re-landing of rust-lang#134040.

r? clubby789

This ended up causing problems with rust-analyzer that were (hopefully) fixed by #134123.

This was referenced

Dec 12, 2024

jieyouxu added a commit to jieyouxu/rust that referenced this pull request

Dec 12, 2024

…ln, r=jieyouxu"

This reverts commit b282774, reversing changes made to e0f3db0.

bors added a commit to rust-lang-ci/rust that referenced this pull request

Dec 12, 2024

Revert "bootstrap: print{ln}! -> eprint{ln}! (take 2) rust-lang#134040"

Unfortunately, rust-lang#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 rust-lang#134040:

Revert rust-lang#134123 which is a fix-forward after rust-lang#134040.
Revert rust-lang#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

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request

Dec 12, 2024