Skip to content

Use --cfg when running doctests - #30372

Merged
bors merged 1 commit into
rust-lang:masterfrom
sanxiyn:rustdoc-cfg
Dec 16, 2015
Merged

Use --cfg when running doctests#30372
bors merged 1 commit into
rust-lang:masterfrom
sanxiyn:rustdoc-cfg

Conversation

@sanxiyn

@sanxiynsanxiyn commented Dec 14, 2015

Copy link
Copy Markdown
Contributor

Fix#30252.

@rust-highfive

rust-highfive commented Dec 14, 2015

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton

alexcrichton commented Dec 14, 2015

Copy link
Copy Markdown
Member

Thanks! Could the test actually be added to src/test/rustdoc? I think modifying // compile-flags should allow it to do the right thing, other than that r=me

@sanxiyn
Use --cfg when running doctests
eb25721
Previously passed --cfg was used only when collecting doctests.
@sanxiyn

sanxiyn commented Dec 15, 2015

Copy link
Copy Markdown
ContributorAuthor

Test moved. Thanks for reviewing!

@sanxiyn

sanxiyn commented Dec 15, 2015

Copy link
Copy Markdown
ContributorAuthor

@bors r=alexcrichton

@bors

bors commented Dec 15, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit eb25721 has been approved by alexcrichton

Manishearth added a commit to Manishearth/rust that referenced this pull request Dec 16, 2015
@Manishearth
Rollup merge ofrust-lang#30372- sanxiyn:rustdoc-cfg, r=alexcrichton
d91c344
Fixrust-lang#30252.
@ManishearthManishearth mentioned this pull request Dec 16, 2015
Merged
bors added a commit that referenced this pull request Dec 16, 2015
@bors
Auto merge of#30410- Manishearth:rollup, r=Manishearth
785a8a6
- Successful merges: #30320, #30368, #30372, #30376, #30388, #30392
- Failed merges: #30354, #30389
@bors
bors merged commit eb25721 into rust-lang:masterDec 16, 2015
@sanxiyn
sanxiyn deleted the rustdoc-cfg branch December 16, 2015 14:22
cuviper added a commit to rust-num/num that referenced this pull request Dec 21, 2015
@cuviper
Fix the feature masks in the approx_sqrt doc example
2e3e575
The hidden "mod test" layout of the first example has been broken for a
while, but it wasn't noticed because rustdoc wasn't passing any features
at all. That was fixed in rust-lang/rust#30372, and now we need to get
our ducks in a row too.
briansmith added a commit to briansmith/ring that referenced this pull request Jan 8, 2016
@briansmith
Add the no_heap feature to disable heap-using functionality.
cefad3d
The RSA doctest had to be disabled temporarily until
rust-lang/rust#30372 makes it to the stable
Rust channel (Rust 1.8).
Some of the tests and the test framework in |ring::file_test| are still
using the heap. This will be fixed separately.
@briansmith

briansmith commented Jan 8, 2016

Copy link
Copy Markdown
Contributor

Could this change be backported to 1.7 and 1.6?

This seems like a small change that would be low risk for backporting. I am working on adding #![no_std] support to some crates, targetting the Rust 1.6 release where #![no_std] becomes stable. They would benefit from having this change, and I bet others' crates would benefit too, for similar reasons.

Thanks.

@steveklabnik

steveklabnik commented Jan 8, 2016

Copy link
Copy Markdown
Contributor

I'm not sure we should be back porting things this close to the release. I'm on the super conservative side on this though.

On Jan 8, 2016, 16:15 -0500, Brian Smithnotifications@github.com, wrote:

Could this change be backported to 1.7 and 1.6?

This seems like a small change that would be low risk for backporting. I am working on adding#![no_std]support to some crates, targetting the Rust 1.6 release where#![no_std]becomes stable. They would benefit from having this change, and I bet others' crates would benefit too, for similar reasons.

Thanks.

—
Reply to this email directly orview it on GitHub(#30372 (comment)).

@alexcrichtonalexcrichton added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 11, 2016
@alexcrichton

alexcrichton commented Jan 11, 2016

Copy link
Copy Markdown
Member

Adding beta-nominated to have some discussion (doesn't hurt much)

@brsonbrson added relnotes Marks issues that should be documented in the release notes of the next release. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Jan 12, 2016
@brsonbrson mentioned this pull request Jan 12, 2016
Merged
@alexcrichtonalexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 12, 2016
@alexcrichton

alexcrichton commented Jan 12, 2016

Copy link
Copy Markdown
Member

Accepted for a backport

@durkadurka mentioned this pull request Feb 1, 2016
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nikomatsakisnikomatsakis

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.relnotesMarks issues that should be documented in the release notes of the next release.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@sanxiyn@rust-highfive@alexcrichton@bors@briansmith@steveklabnik@brson@nikomatsakis