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

[beta] Doc search backports #46886

Merged
merged 5 commits into from
Dec 23, 2017
Merged

[beta] Doc search backports #46886

merged 5 commits into from
Dec 23, 2017

Conversation

durka
Copy link
Contributor

@durka durka commented Dec 20, 2017 •
edited
Loading

This is a backport of #46081, #46175, #46433, and #46672. They all merged cleanly but I haven't tried a build; let's see what Travis says.

These PRs fix pretty annoying issues with doc search and so I think it's important they don't slip to stable, but these PRs have NOT been beta-accepted yet.

cc @steveklabnik @GuillaumeGomez can you tag the docs team to talk about beta-acceptance?

@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @steveklabnik

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@durka durka changed the title [WIP] Doc search backports [beta] Doc search backports Dec 20, 2017
@GuillaumeGomez GuillaumeGomez added beta-nominated Nominated for backporting to the compiler in the beta channel. A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools labels Dec 21, 2017
@GuillaumeGomez
Copy link
Member

cc @rust-lang/docs

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 21, 2017
@QuietMisdreavus
Copy link
Member

Since we called off next week's meeting, we won't have the chance to get a proper meeting discussion of this before the beta/stable cutoff.

I'm in favor of backporting this, because beta got (effectively) a partial implementation of the search tabs. I would hate to see a complete stable cycle go by with an inferior docs experience.

@steveklabnik
Copy link
Member

Sounds good to me!

@GuillaumeGomez
Copy link
Member

Ok then let's move forward.

@bors: r+

@bors
Copy link
Contributor

bors commented Dec 22, 2017

📌 Commit 42ebc9c has been approved by GuillaumeGomez

@durka
Copy link
Contributor Author

durka commented Dec 22, 2017 •
edited
Loading

There's no tests for this, but I threw up a quick server here with docs built from ./x.py doc --stage 1 src/libstd on this branch: https://alexburka.com:8000

Comparing to beta docs, it looks to me like all the bugs listed here are indeed fixed.

@kennytm
Copy link
Member

kennytm commented Dec 23, 2017

@bors p=2

Beta backport.

@bors
Copy link
Contributor

bors commented Dec 23, 2017

⌛ Testing commit 42ebc9c with merge a1e33e1...

bors added a commit that referenced this pull request Dec 23, 2017
@bors
Auto merge of #46886 - durka:doc-search-backports, r=GuillaumeGomez
a1e33e1 
[beta] Doc search backports

This is a backport of #46081, #46175, #46433, and #46672. They all merged cleanly but I haven't tried a build; let's see what Travis says.

These PRs fix pretty annoying issues with doc search and so I think it's important they don't slip to stable, but these PRs have *NOT* been `beta-accepted` yet.

cc @steveklabnik @GuillaumeGomez can you tag the docs team to talk about beta-acceptance?
@bors
Copy link
Contributor

bors commented Dec 23, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: GuillaumeGomez
Pushing a1e33e1 to beta...

@bors bors merged commit 42ebc9c into rust-lang:beta Dec 23, 2017
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 10, 2018
This was referenced Jan 10, 2018
Merged
Merged
Merged
Merged
@alexcrichton
Copy link
Member

Thanks for the backport @durka (belatedly!).

FWIW in terms of tag management I made this mistake of thinking a bunch of PRs weren't backported when they were here! Feel free to cc me on beta backports to ensure the tags are all done right and otherwise our current method of managing the tags is listed at https://forge.rust-lang.org/beta-backporting.html.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@steveklabnik steveklabnik

Labels
A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@durka @rust-highfive @GuillaumeGomez @QuietMisdreavus @steveklabnik @bors @kennytm @alexcrichton