Skip to content
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

Use --cfg when running doctests #30372

Merged
merged 1 commit into from
Dec 16, 2015
Merged

Use --cfg when running doctests #30372

merged 1 commit into from
Dec 16, 2015

Conversation

sanxiyn
Copy link
Member

@sanxiyn sanxiyn commented Dec 14, 2015

Fix #30252.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@alexcrichton
Copy link
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
Copy link
Member Author

sanxiyn commented Dec 15, 2015

Test moved. Thanks for reviewing!

@sanxiyn
Copy link
Member Author

sanxiyn commented Dec 15, 2015

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Dec 15, 2015

📌 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 of rust-lang#30372 - sanxiyn:rustdoc-cfg, r=alexcrichton
d91c344 
Fix rust-lang#30252.
@Manishearth Manishearth 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:master Dec 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
Copy link
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
Copy link
Member

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)).

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

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

@brson brson 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
@brson brson mentioned this pull request Jan 12, 2016
Merged
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 12, 2016
@alexcrichton
Copy link
Member

Accepted for a backport

@durka durka mentioned this pull request Feb 1, 2016
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. relnotes Marks 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