Don't pass doctest feature by default #65190
Merged
Conversation
This file contains hidden or 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
GuillaumeGomez
force-pushed
the
dont-pass-doctest-feature-by-default
branch
from
14d6281 to
916fdfc
Compare
ollie27
reviewed
Oct 9, 2019
|
|
||
| #![feature(cfg_doctest)] | ||
|
|
||
| // Make sure `cfg(doctest)` is not set when finding doctests but not inside |
There was a problem hiding this comment.
Suggested change
| // Make sure `cfg(doctest)` is not set when finding doctests but not inside | |
| // Make sure `cfg(doctest)` is set when finding doctests but not inside |
src/librustdoc/test.rs
Outdated
| @@ -64,6 +64,9 @@ pub fn run(options: Options) -> i32 { | |||
|
|
|||
| let mut cfgs = options.cfgs.clone(); | |||
| cfgs.push("rustdoc".to_owned()); | |||
| if options.should_test { | |||
There was a problem hiding this comment.
You can remove the options.should_test check here because it will always be true in this function.
There was a problem hiding this comment.
Ah indeed, good catch!
GuillaumeGomez
force-pushed
the
dont-pass-doctest-feature-by-default
branch
from
916fdfc to
3e376f5
Compare
|
@bors: r=Mark-Simulacrum |
|
📌 Commit 3e376f5 has been approved by |
bors
added
the
S-waiting-on-bors
|
⌛ Testing commit 3e376f5 with merge 9ec7904c40eade0beab9a1db174a2a8cb7da7c3b... |
|
@bors retry yielding to rollup |
|
⌛ Testing commit 3e376f5 with merge 2e1c9c662a46428afca61c8e3e17e54c39266032... |
|
@bors retry |
This comment has been minimized.
This comment has been minimized.
|
⌛ Testing commit 3e376f5 with merge 6eacf267df3cf728f32b94f8fbaf206cc76cc62b... |
|
@bors retry |
bors
added a commit
that referenced
this pull request
Oct 12, 2019
…fault, r=Mark-Simulacrum Don't pass doctest feature by default As asked in #63803 (comment). r? @QuietMisdreavus
|
☀️ Test successful - checks-azure |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As asked in #63803 (comment).
r? @QuietMisdreavus