Skip to content

Fix rustdoc strings indentation - #76154

Merged
bors merged 2 commits into
rust-lang:masterfrom
GuillaumeGomez:strings-indent
Sep 1, 2020
Merged

Fix rustdoc strings indentation#76154
bors merged 2 commits into
rust-lang:masterfrom
GuillaumeGomez:strings-indent

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

I took the opportunity to clean up our strings indentation a bit because it was a bit messy.

r? @jyn514

@rust-highfive

Copy link
Copy Markdown
Contributor

Some changes occurred in intra-doc-links.

cc @jyn514

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 31, 2020
@jyn514jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Aug 31, 2020

@jyn514jyn514 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This was mangled by #67540 I assume?

@jyn514

Copy link
Copy Markdown
Member

Do we have tests for everything other than debug!? If so, r=me when CI is fixed.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: r=jyn514

@bors

bors commented Aug 31, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b741cc5 has been approved by jyn514

@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 Aug 31, 2020
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors: rollup

@tmandrytmandry mentioned this pull request Sep 1, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 1, 2020
Rollup of 12 pull requests
Successful merges:
- rust-lang#75945 (Use `env::func()`, not 'the function env::func' in docs for std::env)
- rust-lang#76002 (Fix `-Z instrument-coverage` on MSVC)
- rust-lang#76003 (Adds two source span utility functions used in source-based coverage)
- rust-lang#76059 (Clean up E0764)
- rust-lang#76103 (Clean up E0769)
- rust-lang#76139 (Make `cow_is_borrowed` methods const)
- rust-lang#76154 (Fix rustdoc strings indentation)
- rust-lang#76161 (Remove notrust in rustc_middle)
- rust-lang#76163 (README: Adjust Linux and macOS support platform and architecture)
- rust-lang#76166 (Make `StringReader` private)
- rust-lang#76172 (Revert rust-lang#75463)
- rust-lang#76178 (Update expect-test to 1.0)
Failed merges:
r? @ghost
@bors
bors merged commit 5ac47b1 into rust-lang:masterSep 1, 2020
@GuillaumeGomez
GuillaumeGomez deleted the strings-indent branch September 1, 2020 08:22
@cuvipercuviper added this to the 1.48.0 milestone Nov 17, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.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

Development

Successfully merging this pull request may close these issues.

5 participants

@GuillaumeGomez@rust-highfive@jyn514@bors@cuviper