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

Remove cfg(not(doc)) from doctests #922

Merged
merged 1 commit into from
Oct 1, 2020
Merged

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Oct 1, 2020

This was changed from cfg(dox) to cfg(doc) in
#920. cfg(doc) is incorrect here; rustdoc sets cfg(doctest), not cfg(doc) in doc-tests.

However, this piece of code isn't needed anyway: this code will only
ever be run as a doc-test, so it will never be compiled in.

Part of rust-lang/rust#77347.

r? @Amanieu

This was changed from `cfg(dox)` to `cfg(doc)` in
rust-lang#920. `cfg(doc)` is incorrect
here; rustdoc sets `cfg(doctest)`, not `cfg(doc)` in doc-tests.

However, this piece of code isn't needed anyway: this code will only
ever be run as a doc-test, so it will never be compiled in.
@Amanieu Amanieu merged commit 3c36643 into rust-lang:master Oct 1, 2020
@jyn514 jyn514 deleted the doctests branch October 1, 2020 13:49
jyn514 added a commit to jyn514/rust that referenced this pull request Oct 1, 2020
The primary purpose is to get the fixes from
rust-lang/stdarch#920
and rust-lang/stdarch#922.

The other changes included are
rust-lang/stdarch#917 and
rust-lang/stdarch#919.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants