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

Strengthen well known check-cfg names and values test #118702

Merged
merged 2 commits into from
Dec 9, 2023

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Dec 7, 2023

#118494 is changing the implementation of how we expect well known check-cfg names and values, but we currently don't have a test that checks every well known only some of them.

This PR therefore strengthen our well known names/values test to include all of the configs to at least avoid unintended regressions and validate new entry.

this PR also contains some drive-by consolidation of unexpected target_os, target_arch into a single file

r? @nnethercote (maybe? feel free to re-assign)

@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. labels Dec 7, 2023
compiler/rustc_session/src/config.rs Show resolved Hide resolved
tests/ui/check-cfg/well-known-values.rs Outdated Show resolved Hide resolved
tests/ui/check-cfg/well-known-values.rs Outdated Show resolved Hide resolved
tests/ui/check-cfg/well-known-values.rs Show resolved Hide resolved
@nnethercote
Copy link
Contributor

this PR also contains some drive-by consolidation of unexpected target_os, target_arch into a single file

I generally put these kinds of changes into separate commits. It makes the reviewer's job easier when unrelated changes are separated out.

@Urgau Urgau force-pushed the check-cfg-strengthen-well-known branch from 5bfb9f5 to 455d583 Compare December 8, 2023 00:16
nnethercote added a commit to nnethercote/rust that referenced this pull request Dec 8, 2023
@Urgau Urgau force-pushed the check-cfg-strengthen-well-known branch from 455d583 to 28524b3 Compare December 8, 2023 10:53
@bors
Copy link
Contributor

bors commented Dec 8, 2023

✌️ @Urgau, you can now approve this pull request!

If @nnethercote told you to "r=me" after making some further change, please make that change, then do @bors r=@nnethercote

@Urgau Urgau force-pushed the check-cfg-strengthen-well-known branch from 28524b3 to 5a17ee7 Compare December 8, 2023 11:17
@Urgau
Copy link
Member Author

Urgau commented Dec 8, 2023

@bors r=@nnethercote rollup=always

@bors
Copy link
Contributor

bors commented Dec 8, 2023

@Urgau: 🔑 Insufficient privileges: Not in reviewers

@bors
Copy link
Contributor

bors commented Dec 8, 2023

@Urgau: 🔑 Insufficient privileges: not in try users

@Urgau
Copy link
Member Author

Urgau commented Dec 8, 2023

@bors r=nnethercote

@bors
Copy link
Contributor

bors commented Dec 8, 2023

@Urgau: 🔑 Insufficient privileges: Not in reviewers

@GuillaumeGomez
Copy link
Member

Weird. Oh well.

@bors r=nnethercote rollup

@bors
Copy link
Contributor

bors commented Dec 8, 2023

📌 Commit 5a17ee7 has been approved by nnethercote

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 Dec 8, 2023
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 8, 2023
…own, r=nnethercote

Strengthen well known check-cfg names and values test

rust-lang#118494 is changing the implementation of how we expect well known check-cfg names and values, but we currently don't have a test that checks every well known only some of them.

This PR therefore strengthen our well known names/values test to include all of the configs to at least avoid unintended regressions and validate new entry.

*this PR also contains some drive-by consolidation of unexpected `target_os`, `target_arch` into a single file*

r? `@nnethercote` (maybe? feel free to re-assign)
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 8, 2023
…own, r=nnethercote

Strengthen well known check-cfg names and values test

rust-lang#118494 is changing the implementation of how we expect well known check-cfg names and values, but we currently don't have a test that checks every well known only some of them.

This PR therefore strengthen our well known names/values test to include all of the configs to at least avoid unintended regressions and validate new entry.

*this PR also contains some drive-by consolidation of unexpected `target_os`, `target_arch` into a single file*

r? ``@nnethercote`` (maybe? feel free to re-assign)
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 8, 2023
…estsa, r=Nilstrieb

Extend tidy alphabetical checking to `tests/`.

This is desired for rust-lang#118702.

r? ``@Nilstrieb``
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 8, 2023
…own, r=nnethercote

Strengthen well known check-cfg names and values test

rust-lang#118494 is changing the implementation of how we expect well known check-cfg names and values, but we currently don't have a test that checks every well known only some of them.

This PR therefore strengthen our well known names/values test to include all of the configs to at least avoid unintended regressions and validate new entry.

*this PR also contains some drive-by consolidation of unexpected `target_os`, `target_arch` into a single file*

r? ```@nnethercote``` (maybe? feel free to re-assign)
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 8, 2023
…estsa, r=Nilstrieb

Extend tidy alphabetical checking to `tests/`.

This is desired for rust-lang#118702.

r? ```@Nilstrieb```
@GuillaumeGomez
Copy link
Member

Failed in #118744.

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Dec 8, 2023
…estsa, r=Nilstrieb

Extend tidy alphabetical checking to `tests/`.

This is desired for rust-lang#118702.

r? ````@Nilstrieb````
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Dec 9, 2023
…own, r=nnethercote

Strengthen well known check-cfg names and values test

rust-lang#118494 is changing the implementation of how we expect well known check-cfg names and values, but we currently don't have a test that checks every well known only some of them.

This PR therefore strengthen our well known names/values test to include all of the configs to at least avoid unintended regressions and validate new entry.

*this PR also contains some drive-by consolidation of unexpected `target_os`, `target_arch` into a single file*

r? `@nnethercote` (maybe? feel free to re-assign)
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Dec 9, 2023
…estsa, r=Nilstrieb

Extend tidy alphabetical checking to `tests/`.

This is desired for rust-lang#118702.

r? `@Nilstrieb`
@workingjubilee
Copy link
Member

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 9, 2023
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Dec 9, 2023
…estsa, r=Nilstrieb

Extend tidy alphabetical checking to `tests/`.

This is desired for rust-lang#118702.

r? ``@Nilstrieb``
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Dec 9, 2023
…estsa, r=Nilstrieb

Extend tidy alphabetical checking to `tests/`.

This is desired for rust-lang#118702.

r? ```@Nilstrieb```
as they unnecessarily clutter the diagnostic output and make the
experience of adding a new target to the compiler more painful than
it should be.

target_os and target_arch are still being tested in the
well-known-values.rs test, but in one place.
@Urgau Urgau force-pushed the check-cfg-strengthen-well-known branch from 5a17ee7 to 4c16716 Compare December 9, 2023 11:05
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 9, 2023
Rollup merge of rust-lang#118737 - nnethercote:tidy-alphabetical-in-testsa, r=Nilstrieb

Extend tidy alphabetical checking to `tests/`.

This is desired for rust-lang#118702.

r? ```@Nilstrieb```
@Urgau
Copy link
Member Author

Urgau commented Dec 9, 2023

I've rebased and re-blessed the diagnostic output (new win7 target).

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 9, 2023
@GuillaumeGomez
Copy link
Member

@bors r=nnethercote

@bors
Copy link
Contributor

bors commented Dec 9, 2023

📌 Commit 4c16716 has been approved by nnethercote

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 Dec 9, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 9, 2023
…llaumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#117953 (Add more SIMD platform-intrinsics)
 - rust-lang#118057 (dedup for duplicate suggestions)
 - rust-lang#118638 (More `rustc_mir_dataflow` cleanups)
 - rust-lang#118702 (Strengthen well known check-cfg names and values test)
 - rust-lang#118734 (Unescaping cleanups)
 - rust-lang#118766 (Lower some forgotten spans)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 78d2c8e into rust-lang:master Dec 9, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 9, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 9, 2023
Rollup merge of rust-lang#118702 - Urgau:check-cfg-strengthen-well-known, r=nnethercote

Strengthen well known check-cfg names and values test

rust-lang#118494 is changing the implementation of how we expect well known check-cfg names and values, but we currently don't have a test that checks every well known only some of them.

This PR therefore strengthen our well known names/values test to include all of the configs to at least avoid unintended regressions and validate new entry.

*this PR also contains some drive-by consolidation of unexpected `target_os`, `target_arch` into a single file*

r? `@nnethercote` (maybe? feel free to re-assign)
@Urgau Urgau deleted the check-cfg-strengthen-well-known branch December 9, 2023 17:08
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