Skip to content

Commit

Permalink
Rollup merge of #133710 - Urgau:target_feature-merge-conflitcs, r=jie…
Browse files Browse the repository at this point in the history
…youxu

Reducing `target_feature` check-cfg merge conflicts

It was rightfully pointed in rust-lang/rust#133099 (comment) that the expected values for the `target_feature` cfg are regularly updated and unfortunately the check-cfg tests for it are very merge-conflict prone.

This PR aims at drastically reducing the likely-hood of those, by normalizing the "and X more" diagnostic, as well as making the full expected list multi-line instead of being on a single one.

cc `@RalfJung`
r? `@jieyouxu`
  • Loading branch information
GuillaumeGomez authored Dec 2, 2024
2 parents 5915426 + e0047a6 commit 4aed50c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 4aed50c

Please sign in to comment.