Skip to content

Rollup of 5 pull requests - #79515

Closed
GuillaumeGomez wants to merge 13 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-qoiuahp
Closed

Rollup of 5 pull requests#79515
GuillaumeGomez wants to merge 13 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-qoiuahp

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomezand others added 13 commits November 24, 2020 18:07
…jyn514
Rename "stability" CSS class to "item-info" and combine `document_stability` with `document_short`
Follow-up of rust-lang#79300
The point of this PR is to make the CSS class more accurate since it's not only about stability anymore.
r? `@jyn514`
…ark-Simulacrum
BTreeMap: try to enhance various comments
All in internal documentation, propagating the "key-value pair" notation from public documentation.
r? `@Mark-Simulacrum`
…rror-output, r=jyn514
Improve rustdoc JS tests error output
It's pretty common when starting to add new tests for rustdoc-js to have issues to understand the errors. With this, it should make things a bit simpler. So now, in case of an error, it displays:
```
---- [js-doc-test] rustdoc-js/basic.rs stdout ----
error: rustdoc-js test failed!
failed to decode compiler output as json: line: {
output: Checking "basic" ... FAILED
==> Result not found in 'others': '{"path":"basic","name":"Fo"}'
Diff of first error:
{
"path": "basic",
- "name": "Fo",
+ "name": "Foo",
}
thread '[js-doc-test] rustdoc-js/basic.rs' panicked at 'explicit panic', src/tools/compiletest/src/json.rs:126:21
```
I think it was `@camelid` who asked about it a few days ago?
r? `@jyn514`
…=jyn514
Extend doc keyword feature by allowing any ident
Part of rust-lang#51315.
As suggested by `@danielhenrymantilla` in [this comment](rust-lang#51315 (comment)), this PR extends `#[doc(keyword = "...")]` to allow any ident to be used as keyword. The final goal is to allow (proc-)macro crates' owners to write documentation of the keywords they might introduce.
r? `@jyn514`
@rustbotrustbot added the rollup A PR which is a rollup label Nov 28, 2020
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r+ p=5

@bors

bors commented Nov 28, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 427cdef has been approved by GuillaumeGomez

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 28, 2020
@bors

bors commented Nov 28, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 427cdef with merge 36e12fa7cf9e89944c5c1ddfbf71216989824d9e...

@bors

bors commented Nov 28, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Nov 28, 2020
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: retry

@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 Nov 29, 2020
@bors

bors commented Nov 29, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 427cdef with merge 3f678de27cde83ec8af56d5f998abda95471f17f...

@GuillaumeGomez
GuillaumeGomez deleted the rollup-qoiuahp branch November 29, 2020 14:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@GuillaumeGomez@bors@rustbot@ssomers@matklad