tests: clean up over-constraint on LLVM feature count - #158922
Merged
rust-bors[bot] merged 1 commit intoJul 8, 2026
Conversation
Upstream dropped a feature, resulting in the invalid-attribute test failing because it was expecting "and 76 more" but now it's "and 75 more". Adjust the test to do a replacement with a placeholder on that text so the test is less brittle.
rustbot
added
S-waiting-on-review
Collaborator
|
r? @chenyukang rustbot has assigned @chenyukang. Use Why was this reviewer chosen?The reviewer was selected based on:
|
Contributor
Author
|
This is related to #158910, but can land separately. |
Contributor
Author
|
@rustbot label llvm-main |
rustbot
added
the
llvm-main
Contributor
|
@bors r+ rollup |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 7, 2026
…uwer Rollup of 19 pull requests Successful merges: - #156016 (view-types: store view types in the AST) - #157385 (Enable Enzyme on x86_64-apple) - #158179 (std: unconditionally use `preadv`/`pwritev` on AArch64 macOS) - #158621 (disallow `extern "custom"` on wasm and spirv targets) - #158690 (delegation: support mapping of all arguments with `Self` type) - #158696 (Rename some `body_id` to `body_def_id`) - #158697 (Fixes for QNX SDP 8) - #158760 (Clarify that `LocalKey::try_with` may return `AccessError`) - #157801 (Rewrite safety requirements for `Allocator` impls) - #158085 (rustdoc: Fix sidebar heading order) - #158333 (Fix typetree generation for differentiated functions) - #158646 (powerpc64le_unknown_freebsd.rs: link with -lgcc) - #158701 ( diagnostics: suggest type annotation for closure params on HRTB FnOnce mismatch) - #158791 (Avoid unused braces lint for macro generated arguments) - #158802 (Use `ci-mirrors` in `armhf-gnu` for {busybox, ubuntu rootfs} artifacts) - #158841 (Avoid final override ICE for RPITIT associated types) - #158889 (tests: catch up with LLVM returning f128 on the stack) - #158905 (delegation: add constraints to new generic args) - #158922 (tests: clean up over-constraint on LLVM feature count) Failed merges: - #158617 (allow mGCA const arguments to fall back to anon consts)
rust-timer
added a commit
that referenced
this pull request
Jul 8, 2026
Rollup merge of #158922 - durin42:llvm-23-clean-up-test-constraint, r=nikic tests: clean up over-constraint on LLVM feature count Upstream dropped a feature, resulting in the invalid-attribute test failing because it was expecting "and 76 more" but now it's "and 75 more". Adjust the test to do a replacement with a placeholder on that text so the test is less brittle.
flip1995
pushed a commit
to flip1995/rust-clippy
that referenced
this pull request
Aug 17, 2026
…uwer Rollup of 19 pull requests Successful merges: - rust-lang/rust#156016 (view-types: store view types in the AST) - rust-lang/rust#157385 (Enable Enzyme on x86_64-apple) - rust-lang/rust#158179 (std: unconditionally use `preadv`/`pwritev` on AArch64 macOS) - rust-lang/rust#158621 (disallow `extern "custom"` on wasm and spirv targets) - rust-lang/rust#158690 (delegation: support mapping of all arguments with `Self` type) - rust-lang/rust#158696 (Rename some `body_id` to `body_def_id`) - rust-lang/rust#158697 (Fixes for QNX SDP 8) - rust-lang/rust#158760 (Clarify that `LocalKey::try_with` may return `AccessError`) - rust-lang/rust#157801 (Rewrite safety requirements for `Allocator` impls) - rust-lang/rust#158085 (rustdoc: Fix sidebar heading order) - rust-lang/rust#158333 (Fix typetree generation for differentiated functions) - rust-lang/rust#158646 (powerpc64le_unknown_freebsd.rs: link with -lgcc) - rust-lang/rust#158701 ( diagnostics: suggest type annotation for closure params on HRTB FnOnce mismatch) - rust-lang/rust#158791 (Avoid unused braces lint for macro generated arguments) - rust-lang/rust#158802 (Use `ci-mirrors` in `armhf-gnu` for {busybox, ubuntu rootfs} artifacts) - rust-lang/rust#158841 (Avoid final override ICE for RPITIT associated types) - rust-lang/rust#158889 (tests: catch up with LLVM returning f128 on the stack) - rust-lang/rust#158905 (delegation: add constraints to new generic args) - rust-lang/rust#158922 (tests: clean up over-constraint on LLVM feature count) Failed merges: - rust-lang/rust#158617 (allow mGCA const arguments to fall back to anon consts)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upstream dropped a feature, resulting in the invalid-attribute test failing because it was expecting "and 76 more" but now it's "and 75 more". Adjust the test to do a replacement with a placeholder on that text so the test is less brittle.