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

Fix macro missing from doc search #51592

Merged
merged 3 commits into from
Jun 29, 2018
Merged

Fix macro missing from doc search #51592

merged 3 commits into from
Jun 29, 2018

Conversation

GuillaumeGomez
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 16, 2018
@ollie27
Copy link
Member

ollie27 commented Jun 18, 2018

It's not just macros, it's any namespace collision like the following:

pub fn foo() {}
pub struct foo {}

only one foo appears in the search results.

@GuillaumeGomez
Copy link
Member Author

I'll extend the fix then.

@GuillaumeGomez
Copy link
Member Author

@ollie27: Your code doesn't work btw (for obvious reasons) but I extended my fix to make it work on all items at once.

@pietroalbini
Copy link
Member

Ping from triage @QuietMisdreavus! This PR needs your review.

ollie27
ollie27 reviewed Jun 25, 2018
View reviewed changes
src/librustdoc/html/static/main.js Outdated
@@ -160,6 +160,7 @@
// used for special search precedence
var TY_PRIMITIVE = itemTypes.indexOf("primitive");
var TY_KEYWORD = itemTypes.indexOf("keyword");
var TY_MACRO = itemTypes.indexOf("macro");
Copy link
Member

Choose a reason for hiding this comment

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

TY_MACRO is no longer used anywhere.

Copy link
Member Author

Choose a reason for hiding this comment

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

True! Good catch!

@ollie27
Copy link
Member

ollie27 commented Jun 25, 2018

Your code doesn't work btw (for obvious reasons)

What code?

This will need to be backported to beta as it affects 1.28.

@pietroalbini pietroalbini added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 25, 2018
@GuillaumeGomez
Copy link
Member Author

This one:

pub fn foo() {}
pub struct foo {}

@pietroalbini pietroalbini added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jun 27, 2018
@GuillaumeGomez
Copy link
Member Author

I'll just go ahead, this is a huge fix and I know that @QuietMisdreavus is very busy. Not having a fully working search is just too much of a problem.

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Jun 28, 2018

📌 Commit e3b2583 has been approved by GuillaumeGomez

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 28, 2018
@bors
Copy link
Contributor

bors commented Jun 29, 2018

⌛ Testing commit e3b2583 with merge 775ce97...

bors added a commit that referenced this pull request Jun 29, 2018
@bors
Auto merge of #51592 - GuillaumeGomez:fix-macro-doc-search, r=Guillau…
775ce97 
…meGomez

Fix macro missing from doc search

Fixes #51095.

r? @QuietMisdreavus
@bors
Copy link
Contributor

bors commented Jun 29, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing 775ce97 to master...

@bors bors merged commit e3b2583 into rust-lang:master Jun 29, 2018
@GuillaumeGomez GuillaumeGomez deleted the fix-macro-doc-search branch June 29, 2018 06:57
@pietroalbini
Copy link
Member

Ping @rust-lang/rustdoc, can someone approve the beta backport (if you want to do that)? Thanks!

@GuillaumeGomez
Copy link
Member Author

I approve it (if needed).

@pietroalbini pietroalbini added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 1, 2018
@pietroalbini pietroalbini mentioned this pull request Jul 5, 2018
Merged
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 5, 2018
bors added a commit that referenced this pull request Jul 5, 2018
@bors
Auto merge of #52076 - pietroalbini:beta-backports, r=pietroalbini
aabb736 
[beta] Rollup backports

Merged and approved:

* #51997: add entry for cargo-metadata feature to RELEASES
* #51592: Fix macro missing from doc search
* #51828: Do not allow LLVM to increase a TLS's alignment on macOS.

r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ollie27 ollie27 ollie27 left review comments

Assignees

@QuietMisdreavus QuietMisdreavus

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@GuillaumeGomez @ollie27 @pietroalbini @bors @QuietMisdreavus @rust-highfive