Skip to content

/rust

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: Don't record associated items from trait impls in the search-index #31837

Merged
merged 2 commits into from Feb 25, 2016

Conversation

Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@mitaa @alexcrichton @bors
@mitaa
Copy link
Contributor

mitaa commented Feb 23, 2016

This effectively only records associated items from either inherent impls or trait definitions in the search-index.

fixes #31808

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton Feb 23, 2016

@mitaa mitaa force-pushed the mitaa:rdoc-inherent-assoc branch from cf99705 to 063b4b4 Feb 23, 2016

src/librustdoc/html/render.rs
true
}
clean::ImplItem(ref i) => {
self.parent_is_trait_impl = i.trait_.is_some();

This comment has been minimized.

Sign in to view
Copy link
@alexcrichton

alexcrichton Feb 23, 2016

Member

I think you can have an impl-in-an-impl, so this flag may need to be preserved and restored across the recursive calls?

@mitaa mitaa force-pushed the mitaa:rdoc-inherent-assoc branch 2 times, most recently from 426d9e7 to f240bb4 Feb 23, 2016

@mitaa

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

mitaa commented Feb 23, 2016

I pushed an update restoring the flag across recursive calls.
src/librustdoc/html/render.rs Outdated
@@ -1140,6 +1145,7 @@ impl DocFolder for Cache {
}
_ => false
};
let parent_is_trait_impl = self.parent_is_trait_impl;

This comment has been minimized.

Sign in to view
Copy link
@alexcrichton

alexcrichton Feb 23, 2016

Member

Shouldn't this be saved before the match above which modifies it?

@mitaa mitaa force-pushed the mitaa:rdoc-inherent-assoc branch from f240bb4 to f5df7e0 Feb 23, 2016

@mitaa

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

mitaa commented Feb 23, 2016

Shouldn't this be saved before the match above which modifies it?

Yeah.. sorry, about that.
(updated)
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Feb 23, 2016

@bors: r+ f5df7e0
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 24, 2016

⌛️ Testing commit f5df7e0 with merge a46718e...

bors added a commit that referenced this pull request Feb 24, 2016

@bors
Auto merge of #31837 - mitaa:rdoc-inherent-assoc, r=alexcrichton 
This effectively only records associated items from either inherent impls or trait definitions in the search-index.

fixes #31808

r? @alexcrichton
a46718e
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Feb 24, 2016

💔 Test failed - auto-win-gnu-32-nopt-t
@alexcrichton

This comment has been minimized.

Sign in to view
Copy link
Member

alexcrichton commented Feb 25, 2016

@bors: retry

On Wed, Feb 24, 2016 at 11:49 AM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-gnu-32-nopt-t
http://buildbot.rust-lang.org/builders/auto-win-gnu-32-nopt-t/builds/3210

—
Reply to this email directly or view it on GitHub
#31837 (comment).

Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 25, 2016

@Manishearth
Rollup merge of rust-lang#31837 - mitaa:rdoc-inherent-assoc, r=alexcr… 
…ichton

This effectively only records associated items from either inherent impls or trait definitions in the search-index.

fixes rust-lang#31808

r? @alexcrichton
10a2f15

@Manishearth Manishearth referenced this pull request Feb 25, 2016

Merged

Rollup of 10 pull requests #31882

bors added a commit that referenced this pull request Feb 25, 2016

@bors
Auto merge of #31882 - Manishearth:rollup, r=Manishearth 
- Successful merges: #31362, #31793, #31800, #31809, #31818, #31827, #31831, #31835, #31837, #31846
- Failed merges:
35fc9d8

bors added a commit that referenced this pull request Feb 25, 2016

@bors
Auto merge of #31882 - Manishearth:rollup, r=Manishearth 
- Successful merges: #31362, #31793, #31800, #31809, #31818, #31827, #31831, #31835, #31837, #31846
- Failed merges:
b27e19c

Manishearth added a commit to Manishearth/rust that referenced this pull request Feb 25, 2016

@Manishearth
Rollup merge of rust-lang#31837 - mitaa:rdoc-inherent-assoc, r=alexcr… 
…ichton

This effectively only records associated items from either inherent impls or trait definitions in the search-index.

fixes rust-lang#31808

r? @alexcrichton
e584a49

bors added a commit that referenced this pull request Feb 25, 2016

@bors
Auto merge of #31882 - Manishearth:rollup, r=Manishearth 
- Successful merges: #31362, #31793, #31800, #31809, #31818, #31827, #31831, #31835, #31837, #31846
- Failed merges:
c9852e2

@bors bors merged commit f5df7e0 into rust-lang:master Feb 25, 2016
1 of 2 checks passed

1 of 2 checks passed

homu Test failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@mitaa mitaa deleted the mitaa:rdoc-inherent-assoc branch Feb 25, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.