Skip to content

[beta] Doc search backports - #46886

Merged
bors merged 5 commits into
rust-lang:betafrom
durka:doc-search-backports
Dec 23, 2017
Merged

[beta] Doc search backports#46886
bors merged 5 commits into
rust-lang:betafrom
durka:doc-search-backports

Conversation

@durka

@durkadurka commented Dec 20, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

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

rust-highfive commented Dec 20, 2017

Copy link
Copy Markdown
Contributor

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive

rust-highfive commented Dec 20, 2017

Copy link
Copy Markdown
Contributor

r? @steveklabnik

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

@rust-highfive

rust-highfive commented Dec 20, 2017

Copy link
Copy Markdown
Contributor

warningWarningwarning

  • 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!

@durkadurka changed the title [WIP] Doc search backports[beta] Doc search backportsDec 20, 2017
@GuillaumeGomezGuillaumeGomez 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

GuillaumeGomez commented Dec 21, 2017

Copy link
Copy Markdown
Member

cc @rust-lang/docs

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

QuietMisdreavus commented Dec 21, 2017

Copy link
Copy Markdown
Contributor

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

steveklabnik commented Dec 21, 2017

Copy link
Copy Markdown
Contributor

Sounds good to me!

@GuillaumeGomez

GuillaumeGomez commented Dec 22, 2017

Copy link
Copy Markdown
Member

Ok then let's move forward.

@bors: r+

@bors

bors commented Dec 22, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 42ebc9c has been approved by GuillaumeGomez

@durka

durka commented Dec 22, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

kennytm commented Dec 23, 2017

Copy link
Copy Markdown
Member

@bors p=2

Beta backport.

@bors

bors commented Dec 23, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Dec 23, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 42ebc9c into rust-lang:betaDec 23, 2017
@alexcrichtonalexcrichton 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

alexcrichton commented Jan 10, 2018

Copy link
Copy Markdown
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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@steveklabniksteveklabnik

Labels

A-docsArea: Documentation for any part of the project, including the compiler, standard library, and toolsS-waiting-on-reviewStatus: 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