Skip to content

rustdoc: strip trait impls of stripped types #12195

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

Merged
merged 2 commits into from
Feb 14, 2014

Conversation

lilyball
Copy link
Contributor

Strip trait impls for types that are stripped either due to the strip-hidden or strip-private passes.

This fixes the search index including trait methods on stripped structs (which breaks searching), and it also removes private types from the implementors list of a trait.

Fixes #9981 and #11439.

@lilyball
Copy link
Contributor Author

r? @alexcrichton

&clean::Word(ref s) if "hidden" == *s => {
debug!("found one in strip_hidden; removing");
self.stripped.insert(i.id);
return None;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a crazy amount of nesting.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, but it's pre-existing. I only added a single level to deal with the re-borrowing of stripped.

@adrientetar
Copy link
Contributor

This closes #9981 and #11439.

In strip-private, also strip impls of traits for private types. This
fixes the search index so searching for "drop", "eq", etc doesn't throw
an exception.
In the strip-hidden pass, record all types that were stripped, and make
a second pass stripping all impls of traits for these types.
@lilyball
Copy link
Contributor Author

Rebased

bors added a commit that referenced this pull request Feb 14, 2014
… r=cmr

Strip trait impls for types that are stripped either due to the strip-hidden or strip-private passes.

This fixes the search index including trait methods on stripped structs (which breaks searching), and it also removes private types from the implementors list of a trait.

Fixes #9981 and #11439.
@bors bors closed this Feb 14, 2014
@bors bors merged commit 9e6c3f0 into rust-lang:master Feb 14, 2014
@adrientetar
Copy link
Contributor

@kballard #11439 didn't get closed (I think GitHub doesn't parse "and #number").

@lilyball lilyball deleted the rustdoc-strip-impls-of-stripped branch February 15, 2014 20:27
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.

Javascript error in rustdoc search
4 participants