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.

Sign up for GitHub

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

Jump to bottom

Implement --check-cfg option (RFC 3013), take 2 #93915

Merged
merged 1 commit into from
Feb 19, 2022
Merged

Implement --check-cfg option (RFC 3013), take 2 #93915

merged 1 commit into from
Feb 19, 2022

Conversation

Urgau
Copy link
Member

@Urgau Urgau commented Feb 11, 2022

This pull-request implement RFC 3013: Checking conditional compilation at compile time (rust-lang/rfcs#3013) and is based on the previous attempt #89346 by @mwkmwkmwk that was closed due to inactivity.

I have address all the review comments from the previous attempt and added some more tests.

cc #82450
r? @petrochenkov

@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Feb 11, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 11, 2022
@lcnr lcnr mentioned this pull request Feb 14, 2022
Merged
petrochenkov
petrochenkov reviewed Feb 15, 2022
View reviewed changes
compiler/rustc_interface/src/interface.rs Show resolved Hide resolved
compiler/rustc_interface/src/interface.rs Show resolved Hide resolved
compiler/rustc_interface/src/interface.rs Show resolved Hide resolved
compiler/rustc_interface/src/interface.rs Outdated Show resolved Hide resolved
src/librustdoc/lib.rs Outdated Show resolved Hide resolved
compiler/rustc_lint_defs/src/builtin.rs Outdated Show resolved Hide resolved
compiler/rustc_lint_defs/src/builtin.rs Outdated Show resolved Hide resolved
compiler/rustc_interface/src/interface.rs Outdated Show resolved Hide resolved
compiler/rustc_session/src/config.rs Outdated Show resolved Hide resolved
compiler/rustc_session/src/config.rs Outdated Show resolved Hide resolved
@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 15, 2022
@Urgau
Copy link
Member Author

Urgau commented Feb 15, 2022

I have address all the review comments and added tests for the uncovered error cases.
I believe this is now ready for another review.

@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 Feb 15, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
petrochenkov
petrochenkov reviewed Feb 16, 2022
View reviewed changes
compiler/rustc_session/src/config.rs Outdated Show resolved Hide resolved
compiler/rustc_session/src/config.rs Outdated Show resolved Hide resolved
compiler/rustc_session/src/config.rs Outdated Show resolved Hide resolved
compiler/rustc_session/src/config.rs Outdated Show resolved Hide resolved
@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 16, 2022
@Urgau
Copy link
Member Author

Urgau commented Feb 16, 2022

I have fix the last review comments (except for to_check_config, for which I put a comment).
I believe this is now ready for another review.

@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 Feb 16, 2022
@petrochenkov
Copy link
Contributor

r=me after addressing #93915 (comment) and squashing commits.

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 16, 2022
@Urgau @mwkmwkmwk
Implement --check-cfg option (RFC 3013)
3a73ca5 
Co-authored-by: Urgau <[email protected]>
Co-authored-by: Marcelina Kościelnicka <[email protected]>
@Urgau
Copy link
Member Author

Urgau commented Feb 16, 2022

r=me after addressing #93915 (comment) and squashing commits.

Addressed and squashed, but I don't have bors permissions so I can't r=you.

@rustbot ready

@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 16, 2022
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 16, 2022
@petrochenkov
Copy link
Contributor

Thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Feb 16, 2022

📌 Commit 3a73ca5 has been approved by petrochenkov

@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 16, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 18, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2022
@bors
Auto merge of rust-lang#94134 - matthiaskrgr:rollup-b132kjz, r=matthi…
1882597 
…askrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#89892 (Suggest `impl Trait` return type when incorrectly using a generic return type)
 - rust-lang#91675 (Add MemTagSanitizer Support)
 - rust-lang#92806 (Add more information to `impl Trait` error)
 - rust-lang#93497 (Pass `--test` flag through rustdoc to rustc so `#[test]` functions can be scraped)
 - rust-lang#93814 (mips64-openwrt-linux-musl: correct soft-foat)
 - rust-lang#93847 (kmc-solid: Use the filesystem thread-safety wrapper)
 - rust-lang#93877 (asm: Allow the use of r8-r14 as clobbers on Thumb1)
 - rust-lang#93892 (Only mark projection as ambiguous if GAT substs are constrained)
 - rust-lang#93915 (Implement --check-cfg option (RFC 3013), take 2)
 - rust-lang#93953 (Add the `known-bug` test directive, use it, and do some cleanup)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 576afec into rust-lang:master Feb 19, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 19, 2022
This was referenced Feb 19, 2022
Merged
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 25, 2022
@matthiaskrgr
Rollup merge of rust-lang#94154 - Urgau:rustdoc-check-cfg, r=Guillaum…
a85853a 
…eGomez

Wire up unstable rustc --check-cfg to rustdoc

This pull-request wire up the new unstable `--check-cfg` option from `rustc` to `rustdoc` as [requested](rust-lang#93915 (comment)) in the [pull-request](rust-lang#93915) that introduce `--check-cfg`.

The motivation was describe in the original PR by `@jyn514` who wrote rust-lang#89346 (comment):
> > add plumbing to pass --check-cfg from rustdoc (do we want this one?)
>
> It would be useful, I think, it catches issues like cfg(doctst) or something (and in general I would like expansion to match rustc as closely as possible).
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 25, 2022
@matthiaskrgr
Rollup merge of rust-lang#94154 - Urgau:rustdoc-check-cfg, r=Guillaum…
ed202b8 
…eGomez

Wire up unstable rustc --check-cfg to rustdoc

This pull-request wire up the new unstable `--check-cfg` option from `rustc` to `rustdoc` as [requested](rust-lang#93915 (comment)) in the [pull-request](rust-lang#93915) that introduce `--check-cfg`.

The motivation was describe in the original PR by ``@jyn514`` who wrote rust-lang#89346 (comment):
> > add plumbing to pass --check-cfg from rustdoc (do we want this one?)
>
> It would be useful, I think, it catches issues like cfg(doctst) or something (and in general I would like expansion to match rustc as closely as possible).
@cr1901 cr1901 mentioned this pull request Jul 24, 2022
Closed
@Urgau Urgau deleted the rfc-3013 branch May 5, 2023 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

@fbstj fbstj fbstj left review comments

Assignees

@petrochenkov petrochenkov

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
Milestone
1.60.0
Development

Successfully merging this pull request may close these issues.
7 participants
@Urgau @rust-log-analyzer @petrochenkov @bors @fbstj @rust-highfive @rustbot