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

rustdoc: Consider doc(no_inline) in crate-local inlining #32434

Merged
merged 1 commit into from Mar 23, 2016

Conversation

mitaa
Copy link
Contributor

@mitaa mitaa commented Mar 22, 2016

Imports with doc(no_inline) will not be inlined, even when doc(inline) is present.

fixes #32343

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+ 4c71347

Thanks!

@eddyb
Copy link
Member

eddyb commented Mar 23, 2016

@bors rollup

eddyb added a commit to eddyb/rust that referenced this pull request Mar 23, 2016
rustdoc: Consider `doc(no_inline)` in crate-local inlining

Imports with `doc(no_inline)` will not be inlined, even when `doc(inline)` is present.

fixes rust-lang#32343

r? @alexcrichton
bors added a commit that referenced this pull request Mar 23, 2016
Rollup of 11 pull requests

- Successful merges: #32404, #32420, #32423, #32425, #32429, #32430, #32431, #32434, #32437, #32441, #32443
- Failed merges:
@bors bors merged commit 4c71347 into rust-lang:master Mar 23, 2016
@mitaa mitaa deleted the rdoc-no-inline branch March 24, 2016 05:01
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.

Prelude item shows up in two locations in docs
4 participants