Skip to content

Fix macro missing from doc search - #51592

Merged
bors merged 3 commits into
rust-lang:masterfrom
GuillaumeGomez:fix-macro-doc-search
Jun 29, 2018
Merged

Fix macro missing from doc search#51592
bors merged 3 commits into
rust-lang:masterfrom
GuillaumeGomez:fix-macro-doc-search

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Jun 16, 2018

Copy link
Copy Markdown
Member

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

ollie27 commented Jun 18, 2018

Copy link
Copy Markdown
Contributor

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

pubfnfoo(){}pubstructfoo{}

only one foo appears in the search results.

@GuillaumeGomez

GuillaumeGomez commented Jun 18, 2018

Copy link
Copy Markdown
MemberAuthor

I'll extend the fix then.

@GuillaumeGomez

GuillaumeGomez commented Jun 18, 2018

Copy link
Copy Markdown
MemberAuthor

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

@emilyalbini

emilyalbini commented Jun 25, 2018

Copy link
Copy Markdown
Member

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

ollie27
ollie27 reviewed Jun 25, 2018
View reviewed changes
Comment threadsrc/librustdoc/html/static/main.js Outdated
// used for special search precedence
var TY_PRIMITIVE = itemTypes.indexOf("primitive");
var TY_KEYWORD = itemTypes.indexOf("keyword");
var TY_MACRO = itemTypes.indexOf("macro");

@ollie27ollie27Jun 25, 2018

Copy link
Copy Markdown
Contributor

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.

@GuillaumeGomezGuillaumeGomezJun 25, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

True! Good catch!

@ollie27

ollie27 commented Jun 25, 2018

Copy link
Copy Markdown
Contributor

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

What code?

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

@emilyalbiniemilyalbini added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 25, 2018
@GuillaumeGomez

GuillaumeGomez commented Jun 25, 2018

Copy link
Copy Markdown
MemberAuthor

This one:

pubfnfoo(){}pubstructfoo{}

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

GuillaumeGomez commented Jun 28, 2018

Copy link
Copy Markdown
MemberAuthor

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

bors commented Jun 28, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit e3b2583 has been approved by GuillaumeGomez

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

bors commented Jun 29, 2018

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Jun 29, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit e3b2583 into rust-lang:masterJun 29, 2018
@GuillaumeGomez
GuillaumeGomez deleted the fix-macro-doc-search branch June 29, 2018 06:57
@emilyalbini

emilyalbini commented Jun 30, 2018

Copy link
Copy Markdown
Member

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

@GuillaumeGomez

GuillaumeGomez commented Jul 1, 2018

Copy link
Copy Markdown
MemberAuthor

I approve it (if needed).

@emilyalbiniemilyalbini added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 1, 2018
@emilyalbiniemilyalbini mentioned this pull request Jul 5, 2018
Merged
@emilyalbiniemilyalbini 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@ollie27ollie27ollie27 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@QuietMisdreavusQuietMisdreavus

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant 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@emilyalbini@bors@QuietMisdreavus@rust-highfive