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

Ignore commented out lines when finding features #84531

Merged
merged 2 commits into from
Apr 29, 2021

Conversation

syvb
Copy link
Contributor

@syvb syvb commented Apr 24, 2021

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:

/*
#[unstable(feature = "foo", issue = "1234")]
*/

But luckily that never happens in rustc, so foo now ceases to appear in the unstable book.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 24, 2021
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
@Mark-Simulacrum
Copy link
Member

Seems OK. @bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 28, 2021

📌 Commit a7e23f4 has been approved by Mark-Simulacrum

@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 Apr 28, 2021
@jyn514 jyn514 added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Apr 28, 2021
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
@bors bors merged commit 4da8c22 into rust-lang:master Apr 29, 2021
@rustbot rustbot added this to the 1.53.0 milestone Apr 29, 2021
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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unstable Book: "foo" leads to an unrelated tracking issue, it's not a real feature
6 participants