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.

Sign up for GitHub

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

Jump to bottom

rustdoc: Fix some local inlining issues #37773

Merged
merged 1 commit into from
Nov 16, 2016
Merged

rustdoc: Fix some local inlining issues #37773

merged 1 commit into from
Nov 16, 2016

Conversation

ollie27
Copy link
Member

@ollie27 ollie27 commented Nov 14, 2016

  • Only inline public items when inlining glob imports.
  • Never inline while in a private module or a child of a private module.
  • Never inline impls. This allowed the removal of a workaround in the
    rendering code.

@ollie27
rustdoc: Fix some local inlining issues
6fe7786 
* Only inline public items when inlining glob imports.
* Never inline while in a private module or a child of a private module.
* Never inline impls. This allowed the removal of a workaround in the
rendering code.
@rust-highfive
Copy link
Collaborator

r? @steveklabnik

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

@ollie27 ollie27 mentioned this pull request Nov 14, 2016
Closed
@brson
Copy link
Contributor

brson commented Nov 15, 2016

Thanks for fixing rustdoc issues!

@bors r+

Approving on the basis that you sound like you know what you are doing and wrote tests.

@bors
Copy link
Contributor

bors commented Nov 15, 2016

📌 Commit 6fe7786 has been approved by brson

@bors
Copy link
Contributor

bors commented Nov 16, 2016

⌛ Testing commit 6fe7786 with merge d88d064...

bors added a commit that referenced this pull request Nov 16, 2016
@bors
Auto merge of #37773 - ollie27:rustdoc_inline_glob, r=brson
d88d064 
rustdoc: Fix some local inlining issues

* Only inline public items when inlining glob imports.
* Never inline while in a private module or a child of a private module.
* Never inline impls. This allowed the removal of a workaround in the
rendering code.
@bors
Copy link
Contributor

bors commented Nov 16, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: brson
Pushing d88d064 to master...

@bors bors merged commit 6fe7786 into rust-lang:master Nov 16, 2016
@bors bors mentioned this pull request Nov 16, 2016
Merged
@ollie27 ollie27 deleted the rustdoc_inline_glob branch November 16, 2016 22:13
@ollie27 ollie27 mentioned this pull request Jan 11, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@steveklabnik steveklabnik

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ollie27 @rust-highfive @brson @bors @steveklabnik