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

Error use explicit intra-doc link and fix text #75946

Merged
merged 3 commits into from
Aug 28, 2020
Merged

Error use explicit intra-doc link and fix text #75946

merged 3 commits into from
Aug 28, 2020

Conversation

pickfire
Copy link
Contributor

@pickfire pickfire commented Aug 26, 2020 •
edited
Loading

Follow up of #75629

r? @jyn514

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 26, 2020
jyn514
jyn514 reviewed Aug 26, 2020
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

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

r=me after nits are fixed

library/std/src/error.rs Outdated Show resolved Hide resolved
library/std/src/error.rs Outdated Show resolved Hide resolved
@jyn514 jyn514 added A-intra-doc-links Area: Intra-doc links, the ability to link to items in docs by name A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools labels Aug 26, 2020
@pickfire
Use [xxx()] rather than the [xxx] function
9ea4593 
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
jyn514
jyn514 reviewed Aug 26, 2020
View reviewed changes
library/std/src/error.rs Outdated Show resolved Hide resolved
@pickfire
Reduce duplicate doc link in error
3a814f3 
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
@jyn514
Copy link
Member

jyn514 commented Aug 27, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 27, 2020

📌 Commit 3a814f3 has been approved by jyn514

@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 Aug 27, 2020
@pietroalbini pietroalbini mentioned this pull request Aug 28, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 28, 2020
@bors
Auto merge of rust-lang#76019 - pietroalbini:rollup-1tkgdnd, r=pietro…
3e3c552 
…albini

Rollup of 12 pull requests

Successful merges:

 - rust-lang#75330 (Improve rendering of crate features via doc(cfg))
 - rust-lang#75927 (Use intra-doc links in `core::macros`)
 - rust-lang#75941 (Clean up E0761 explanation)
 - rust-lang#75943 (Fix potential UB in align_offset doc examples)
 - rust-lang#75946 (Error use explicit intra-doc link and fix text)
 - rust-lang#75955 (Use intra-doc links in `core::future::future` and `core::num::dec2flt`)
 - rust-lang#75967 (Fix typo in `std::hint::black_box` docs)
 - rust-lang#75972 (Fix ICE due to carriage return w/ multibyte char)
 - rust-lang#75989 (Rename rustdoc/test -> rustdoc/doctest)
 - rust-lang#75996 (fix wording in release notes)
 - rust-lang#75998 (Add InstrProfilingPlatformFuchsia.c to profiler_builtins)
 - rust-lang#76000 (Adds --bless support to test/run-make-fulldeps)

Failed merges:

r? @ghost
@bors bors merged commit cbe3aef into rust-lang:master Aug 28, 2020
@cuviper cuviper added this to the 1.48.0 milestone Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 left review comments

Assignees

@jyn514 jyn514

Labels
A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools A-intra-doc-links Area: Intra-doc links, the ability to link to items in docs by name S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.48.0
Development

Successfully merging this pull request may close these issues.
5 participants
@pickfire @jyn514 @bors @cuviper @rust-highfive