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

llvm: Tolerate captures in tests #137038

Merged
merged 1 commit into from
Feb 15, 2025
Merged

Conversation

maurer
Copy link
Contributor

@maurer maurer commented Feb 14, 2025

llvm/llvm-project@7e3735d introduces captures annotations. Adjust regexes to be tolerant of these.

@rustbot label:+llvm-main

llvm/llvm-project@7e3735d introduces
`captures` annotations. Adjust regexes to be tolerant of these.
@rustbot
Copy link
Collaborator

rustbot commented Feb 14, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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 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 14, 2025
@nikic
Copy link
Contributor

nikic commented Feb 14, 2025

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 14, 2025

📌 Commit db4c09c has been approved by nikic

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Feb 14, 2025

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 14, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2025
…kingjubilee

Rollup of 10 pull requests

Successful merges:

 - rust-lang#133312 (triagebot: automatically add more rustdoc related labels)
 - rust-lang#134016 (Stabilize `const_is_char_boundary` and `const_str_split_at`.)
 - rust-lang#136971 (Add a new check-pass UI test for returning `impl Fn(T) -> impl Trait`)
 - rust-lang#136983 (Prepare standard library for Rust 2024 migration)
 - rust-lang#137002 (Fix early lint check desc in query)
 - rust-lang#137006 (borrowck diagnostics cleanup: remove an unused and a barely-used field)
 - rust-lang#137032 (Decode metadata buffer in one go)
 - rust-lang#137035 (Normalize closure instance before eagerly monomorphizing it)
 - rust-lang#137037 (add x86-sse2 (32bit) ABI that requires SSE2 target feature)
 - rust-lang#137038 (llvm: Tolerate captures in tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9d659fc into rust-lang:master Feb 15, 2025
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2025
Rollup merge of rust-lang#137038 - maurer:tolerate-captures, r=nikic

llvm: Tolerate captures in tests

llvm/llvm-project@7e3735d introduces `captures` annotations. Adjust regexes to be tolerant of these.

`@rustbot` label:+llvm-main
@rustbot rustbot added this to the 1.86.0 milestone Feb 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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