-
Notifications
You must be signed in to change notification settings - Fork 13.1k
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
Ignore commented out lines when finding features #84531
Merged
Merged
Conversation
This file contains 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
(rust-highfive has picked a reviewer for you, use r? to override) |
jyn514
reviewed
Apr 25, 2021
Co-authored-by: Joshua Nelson <[email protected]>
Seems OK. @bors r+ rollup |
📌 Commit a7e23f4 has been approved by |
m-ou-se
added a commit
to m-ou-se/rust
that referenced
this pull request
Apr 28, 2021
…mulacrum Ignore commented out lines when finding features This fixes rust-lang#76246, where commented out lines were being detected as features by `tidy`, by ignoring those lines when looking for features. It's still not perfect, since it can be fooled by things like: ```rust /* #[unstable(feature = "foo", issue = "1234")] */ ``` But luckily that never happens in `rustc`, so `foo` now ceases to appear in the unstable book.
jackh726
added a commit
to jackh726/rust
that referenced
this pull request
Apr 28, 2021
…mulacrum Ignore commented out lines when finding features This fixes rust-lang#76246, where commented out lines were being detected as features by `tidy`, by ignoring those lines when looking for features. It's still not perfect, since it can be fooled by things like: ```rust /* #[unstable(feature = "foo", issue = "1234")] */ ``` But luckily that never happens in `rustc`, so `foo` now ceases to appear in the unstable book.
jackh726
added a commit
to jackh726/rust
that referenced
this pull request
Apr 29, 2021
…mulacrum Ignore commented out lines when finding features This fixes rust-lang#76246, where commented out lines were being detected as features by `tidy`, by ignoring those lines when looking for features. It's still not perfect, since it can be fooled by things like: ```rust /* #[unstable(feature = "foo", issue = "1234")] */ ``` But luckily that never happens in `rustc`, so `foo` now ceases to appear in the unstable book.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 29, 2021
Rollup of 11 pull requests Successful merges: - rust-lang#84484 (Don't rebuild rustdoc and clippy after checking bootstrap) - rust-lang#84530 (`test tidy` should ignore alternative `build` dir patterns) - rust-lang#84531 (Ignore commented out lines when finding features) - rust-lang#84540 (Build sanitizers for x86_64-unknown-linux-musl) - rust-lang#84555 (Set `backtrace-on-ice` by default for compiler and codegen profiles) - rust-lang#84585 (Add `x.py check src/librustdoc` as an alias for `x.py check src/tools/rustdoc`) - rust-lang#84636 (rustdoc: change aliases attribute to data-aliases) - rust-lang#84646 (Add some regression tests related to rust-lang#82494) - rust-lang#84661 (Remove extra word in `rustc_mir` docs) - rust-lang#84663 (Remove `DropGuard` in `sys::windows::process` and use `StaticMutex` instead) - rust-lang#84668 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
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.
This fixes #76246, where commented out lines were being detected as features by
tidy
, by ignoring those lines when looking for features. It's still not perfect, since it can be fooled by things like:But luckily that never happens in
rustc
, sofoo
now ceases to appear in the unstable book.