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 invalid path generation in rustdoc search #50320

Merged
merged 1 commit into from
May 3, 2018
Merged

Fix invalid path generation in rustdoc search #50320

merged 1 commit into from
May 3, 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 Apr 29, 2018
@GuillaumeGomez
Copy link
Member Author

Being a "hot" bug fix and quite simple change, I'll go ahead for this one and r+ it myself. (If any issue, please r-!).

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Apr 29, 2018

📌 Commit 72fd85a 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 Apr 29, 2018
@bors
Copy link
Contributor

bors commented Apr 29, 2018

⌛ Testing commit 72fd85a9f42e4edf713f95760491190ea4eb1fc9 with merge 74ec79b9aab2361cead60479c9f80b64e4ccb922...

@bors
Copy link
Contributor

bors commented Apr 29, 2018

💔 Test failed - status-appveyor

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

There doesn't seem to be any hurry here -- please don't r+ your own changes unless there is.

I'm not really sure what's going on here, can you drop a comment in the file to explain why we slice off the last bit?

@GuillaumeGomez
Copy link
Member Author

Because this is the complete path, including the item's name.

@QuietMisdreavus
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 2, 2018

📌 Commit 950c1d9 has been approved by QuietMisdreavus

@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 May 2, 2018
@kennytm kennytm mentioned this pull request May 3, 2018
Merged
@kennytm
Copy link
Member

kennytm commented May 3, 2018 •
edited
Loading

@bors rollup- p=0

Got a test failure on i686-mingw-1 in the rollup #50413 (comment), likely due to interaction with #50302. Please add that // ignore-order header.

Checking "alias-2.js" ... FAILED
==> '{"path":"std::ops","name":"Add"}' was supposed to be  before '{"crate":"std","ty":8,"name":"Add","path":"std::ops"}'

@GuillaumeGomez
Copy link
Member Author

@kennytm: done

@kennytm
Copy link
Member

kennytm commented May 3, 2018

@bors r=QuietMisdreavus

@bors
Copy link
Contributor

bors commented May 3, 2018

📌 Commit a876d28 has been approved by QuietMisdreavus

kennytm added a commit to kennytm/rust that referenced this pull request May 3, 2018
@kennytm
Rollup merge of rust-lang#50320 - GuillaumeGomez:fix-search-path-gene…
03a0402 
…ration, r=QuietMisdreavus

Fix invalid path generation in rustdoc search

Fixes rust-lang#50311.
bors added a commit that referenced this pull request May 3, 2018
@bors
Auto merge of #50413 - kennytm:rollup, r=kennytm
e82261d 
Rollup of 12 pull requests

Successful merges:

 - #50302 (Add query search order check)
 - #50320 (Fix invalid path generation in rustdoc search)
 - #50349 (Rename "show type declaration" to "show declaration")
 - #50360 (Clarify wordings of the `unstable_name_collision` lint.)
 - #50365 (Use two vectors in nearest_common_ancestor.)
 - #50393 (Allow unaligned reads in constants)
 - #50401 (Revert "Implement FromStr for PathBuf")
 - #50406 (Forbid constructing empty identifiers from concat_idents)
 - #50407 (Always inline simple BytePos and CharPos methods.)
 - #50416 (check if the token is a lifetime before parsing)
 - #50417 (Update Cargo)
 - #50421 (Fix ICE when using a..=b in a closure.)

Failed merges:
@bors bors merged commit a876d28 into rust-lang:master May 3, 2018
@GuillaumeGomez GuillaumeGomez deleted the fix-search-path-generation branch May 4, 2018 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@QuietMisdreavus QuietMisdreavus

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@GuillaumeGomez @bors @Manishearth @QuietMisdreavus @kennytm @rust-highfive