Skip to content

rustdoc: Don't allow #![feature(...)] on stable or beta #67989

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Jan 14, 2020
Merged

rustdoc: Don't allow #![feature(...)] on stable or beta #67989

merged 1 commit into from
Jan 14, 2020

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Jan 7, 2020

@ollie27 ollie27 mentioned this pull request Jan 7, 2020
Closed
@Mark-Simulacrum Mark-Simulacrum added beta-nominated Nominated for backporting to the compiler in the beta channel. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 7, 2020
@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 8, 2020
@GuillaumeGomez
Copy link
Member

Thanks! Any way to add a test for this?

@ollie27
Copy link
Member Author

ollie27 commented Jan 12, 2020

Any way to add a test for this?

That's a good question but I couldn't think of a good way to add a test. I couldn't find any similar tests for rustc either. I did make a beta build locally to test this though.

@GuillaumeGomez
Copy link
Member

This is a bit suboptimal. :-/ In the worst case, isn't possible to add a test running only on given kind of release? Maybe @Mark-Simulacrum would have an idea?

@Mark-Simulacrum
Copy link
Member

I don't think so, at least not with today's compiler. We could make RUSTC_BOOTSTRAP=0 make nightly behave like beta/stable, but I would rather not do that in this PR. I think if we've tested this, we're unlikely to break it, so I would not worry about testing it just yet.

@GuillaumeGomez
Copy link
Member

Then let's go for it! Thanks @ollie27.

@bors: r+

@bors
Copy link
Collaborator

bors commented Jan 13, 2020

📌 Commit 4057199 has been approved by GuillaumeGomez

@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 Jan 13, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 13, 2020
@Dylan-DPC
Rollup merge of rust-lang#67989 - ollie27:rustdoc_unstable, r=Guillau…
a8728b2 
…meGomez

rustdoc: Don't allow `#![feature(...)]` on stable or beta

Fixes rust-lang#67647

r? @GuillaumeGomez
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jan 13, 2020
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 14, 2020
@JohnTitor
Rollup merge of rust-lang#67989 - ollie27:rustdoc_unstable, r=Guillau…
9e47ddd 
…meGomez

rustdoc: Don't allow `#![feature(...)]` on stable or beta

Fixes rust-lang#67647

r? @GuillaumeGomez
@JohnTitor JohnTitor mentioned this pull request Jan 14, 2020
Merged
bors added a commit that referenced this pull request Jan 14, 2020
@bors
Auto merge of #68201 - JohnTitor:rollup-26e39gu, r=JohnTitor
c06e4ac 
Rollup of 10 pull requests

Successful merges:

 - #67854 (Use `report_in_external_macro` for internal lints)
 - #67989 (rustdoc: Don't allow `#![feature(...)]` on stable or beta)
 - #68036 (libterm: parse extended terminfo format)
 - #68127 (Clarify the relationship between `extended` and `tools` in `config.toml`)
 - #68143 (Forbid elided lifetimes within const generic parameter types)
 - #68150 (Document behavior of set_nonblocking on UnixListener)
 - #68166 (rustdoc: HTML escape arrows on help popup)
 - #68176 (Clean up err codes)
 - #68179 (Remove unneeded scope)
 - #68188 (Tweak assertion note in format check)

Failed merges:

r? @ghost
@bors bors merged commit 4057199 into rust-lang:master Jan 14, 2020
@ollie27 ollie27 deleted the rustdoc_unstable branch January 14, 2020 20:57
@GuillaumeGomez GuillaumeGomez added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 17, 2020
@cuviper cuviper mentioned this pull request Jan 17, 2020
Merged
bors added a commit that referenced this pull request Jan 19, 2020
@bors
Auto merge of #68321 - cuviper:beta-next, r=Dylan-DPC
fb30562 
Beta backports

- expect `fn` after `const unsafe` / `const extern` #68073
- Do not ICE on unicode next point #68084
- rustdoc: Don't allow `#![feature(...)]` on stable or beta #67989

r? @Mark-Simulacrum
@ehuss ehuss mentioned this pull request Jan 20, 2020
Merged
bors added a commit to rust-lang/cargo that referenced this pull request Jan 20, 2020
@bors
Auto merge of #7817 - ehuss:fix-doc-target-test, r=Eh2406
1c4d6ed 
Fix doc_target test which no longer works on stable/beta.

rust-lang/rust#67989 changed it so that `#![feature]` requires nightly.
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 23, 2020
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@GuillaumeGomez GuillaumeGomez

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

rustdoc does not verify feature gates
5 participants
@ollie27 @GuillaumeGomez @Mark-Simulacrum @bors @JohnTitor