Skip to content
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 and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unbreak stage1 tests via ignore-stage1 in proc-macro/invalid-punct-ident-1.rs. #98660

Merged
merged 1 commit into from
Jun 29, 2022

Conversation

eddyb
Copy link
Member

@eddyb eddyb commented Jun 29, 2022

#98188 broke ./x.py test --stage 1 (which I thought we ran in PR CI, cc @rust-lang/infra) i.e. the default ./x.py test in dev checkouts, as the panic in src/test/ui/proc-macro/invalid-punct-ident-1.rs moved from the server (rustc) to the client (proc macro), and that means it's now affected by #59998.

I made the test look like src/test/ui-fulldeps/issue-76270-panic-in-libproc-macro.rs tho I'm a bit confused why that one is in src/test/ui-fulldeps, it should still work in src/test/ui, no? (cc @Aaron1011)

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 29, 2022
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 29, 2022
@lqd
Copy link
Member

lqd commented Jun 29, 2022

r? lqd @bors r+

@bors
Copy link
Contributor

bors commented Jun 29, 2022

📌 Commit a84e19d has been approved by lqd

@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 Jun 29, 2022
@lqd
Copy link
Member

lqd commented Jun 29, 2022

Thanks for the quick fix @eddyb you're the best.

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 29, 2022
…askrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#98434 (Ensure that `static_crt` is set in the bootstrapper whenever using `cc-rs` to get a compiler command line.)
 - rust-lang#98636 (Triagebot: Fix mentions word wrapping.)
 - rust-lang#98642 (Fix rust-lang#98260)
 - rust-lang#98643 (Improve pretty printing of valtrees for references)
 - rust-lang#98646 (rustdoc: fix bugs in main.js popover help and settings)
 - rust-lang#98647 (Update cargo)
 - rust-lang#98652 (`alloc`: clean and ensure `no_global_oom_handling`  builds are warning-free)
 - rust-lang#98660 (Unbreak stage1 tests via ignore-stage1 in `proc-macro/invalid-punct-ident-1.rs`.)
 - rust-lang#98665 (Use verbose help for deprecation suggestion)
 - rust-lang#98668 (Avoid some `&str` to `String` conversions with `MultiSpan::push_span_label`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bba00b5 into rust-lang:master Jun 29, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jun 29, 2022
@eddyb eddyb deleted the invalid-punct-stage1 branch July 28, 2022 01:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants