Skip to content

rustdoc: Don't record associated items from trait impls in the search-index#31837

Merged
bors merged 2 commits intorust-lang:masterfrom
mitaa:rdoc-inherent-assoc
Feb 25, 2016
Merged

rustdoc: Don't record associated items from trait impls in the search-index#31837
bors merged 2 commits intorust-lang:masterfrom
mitaa:rdoc-inherent-assoc

Conversation

@mitaa
Copy link
Contributor

@mitaa 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

@mitaa mitaa force-pushed the rdoc-inherent-assoc branch from cf99705 to 063b4b4 Compare February 23, 2016 11:26
alexcrichton
alexcrichton reviewed Feb 23, 2016
View reviewed changes
src/librustdoc/html/render.rs Outdated
Copy link
Member

@alexcrichton alexcrichton Feb 23, 2016

Choose a reason for hiding this comment

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

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 rdoc-inherent-assoc branch 2 times, most recently from 426d9e7 to f240bb4 Compare February 23, 2016 20:00
@mitaa
Copy link
Contributor Author

mitaa commented Feb 23, 2016

I pushed an update restoring the flag across recursive calls.

alexcrichton
alexcrichton reviewed Feb 23, 2016
View reviewed changes
src/librustdoc/html/render.rs Outdated
Copy link
Member

@alexcrichton alexcrichton Feb 23, 2016

Choose a reason for hiding this comment

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

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

@mitaa mitaa force-pushed the rdoc-inherent-assoc branch from f240bb4 to f5df7e0 Compare February 23, 2016 20:47
@mitaa
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
Copy link
Member

alexcrichton commented Feb 23, 2016

@bors: r+ f5df7e0

@bors
Copy link
Collaborator

bors commented Feb 24, 2016

⌛ Testing commit f5df7e0 with merge a46718e...

@bors
Copy link
Collaborator

bors commented Feb 24, 2016

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

@alexcrichton
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 Manishearth mentioned this pull request Feb 25, 2016
Merged
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…
e584a49 
…ichton

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

fixes rust-lang#31808

r? @alexcrichton
bors added a commit that referenced this pull request Feb 25, 2016
@bors
Auto merge of #31882 - Manishearth:rollup, r=Manishearth
c9852e2 
- Successful merges: #31362, #31793, #31800, #31809, #31818, #31827, #31831, #31835, #31837, #31846
- Failed merges:
@bors bors merged commit f5df7e0 into rust-lang:master Feb 25, 2016
@mitaa mitaa deleted the rdoc-inherent-assoc branch February 25, 2016 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichton alexcrichton

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

rustdoc: implementing trait with associated const for primitive causes panic (regression)

3 participants

@mitaa @alexcrichton @bors