Skip to content

tests: fix up new test for nocapture -> capture(none) change #137390

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

Merged
merged 1 commit into from
Mar 1, 2025

Conversation

durin42
Copy link
Contributor

@durin42 durin42 commented Feb 21, 2025

Same change as #136287, but for a newly introduced test.

@rustbot label llvm-main
r? @nikic

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) labels Feb 21, 2025
@rust-log-analyzer

This comment has been minimized.

@durin42 durin42 force-pushed the llvm-21-nocapture-rename branch from 536c526 to 9a9820e Compare February 21, 2025 17:30
@rust-log-analyzer

This comment has been minimized.

Copy link
Contributor

@nikic nikic left a comment

Choose a reason for hiding this comment

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

I'd prefer if this used some {{.*}} wildcards. For the purposes of this test, we don't care about optimization attributes, only ABI attributes.

@durin42
Copy link
Contributor Author

durin42 commented Feb 21, 2025

How do I know which attributes are ABI and which ones are optimization? I'm a little out of my depth at that point.

@nikic
Copy link
Contributor

nikic commented Feb 21, 2025

How do I know which attributes are ABI and which ones are optimization? I'm a little out of my depth at that point.

sret is the only ABI attribute here.

Same motivation as rust-lang#136287, but for a newly introduced test. Rather than
over-constraining here, we just match the sret and accept pretty much
all other attributes.

@rustbot label llvm-main
r? @nikic
@durin42 durin42 force-pushed the llvm-21-nocapture-rename branch from 9a9820e to b41c232 Compare February 25, 2025 22:46
@durin42
Copy link
Contributor Author

durin42 commented Feb 25, 2025

Went wild with wildcards. LMK if this isn't what you had in mind!

@nikic
Copy link
Contributor

nikic commented Feb 28, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Feb 28, 2025

📌 Commit b41c232 has been approved by nikic

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 Feb 28, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2025
…r=nikic

tests: fix up new test for nocapture -> capture(none) change

Same change as rust-lang#136287, but for a newly introduced test.

`@rustbot` label llvm-main
r? `@nikic`
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2025
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#136503 (Tweak output of const panic diagnostic)
 - rust-lang#137390 (tests: fix up new test for nocapture -> capture(none) change)
 - rust-lang#137617 (Introduce `feature(generic_const_parameter_types)`)
 - rust-lang#137719 (Add missing case explanation for doc inlined re-export of doc hidden item)
 - rust-lang#137763 (Use `mk_ty_from_kind` a bit less, clean up lifetime handling in borrowck)
 - rust-lang#137769 (Do not yeet `unsafe<>` from type when formatting unsafe binder)
 - rust-lang#137776 (Some `rustc_transmute` cleanups)
 - rust-lang#137800 (Remove `ParamEnv::without_caller_bounds`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 11ddd56 into rust-lang:master Mar 1, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 1, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2025
Rollup merge of rust-lang#137390 - durin42:llvm-21-nocapture-rename, r=nikic

tests: fix up new test for nocapture -> capture(none) change

Same change as rust-lang#136287, but for a newly introduced test.

``@rustbot`` label llvm-main
r? ``@nikic``
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) 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.

5 participants