Skip to content

Use intra-doc links in core::future::future and core::num::dec2flt - #75955

Merged
bors merged 3 commits into
rust-lang:masterfrom
camelid:intra-doc-links-for-future-and-dec2flt
Aug 28, 2020
Merged

Use intra-doc links in core::future::future and core::num::dec2flt#75955
bors merged 3 commits into
rust-lang:masterfrom
camelid:intra-doc-links-for-future-and-dec2flt

Conversation

@camelid

@camelidcamelid commented Aug 26, 2020

Copy link
Copy Markdown
Member

Part of #75080.

@rustbot modify labels: A-intra-doc-links T-doc

@rustbotrustbot 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
@rust-highfive

rust-highfive commented Aug 26, 2020

Copy link
Copy Markdown
Contributor

r? @sfackler

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 26, 2020
@bors

bors commented Aug 27, 2020

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #75947) made this pull request unmergeable. Please resolve the merge conflicts.

camelid
camelid commented Aug 27, 2020
View reviewed changes
Comment threadlibrary/core/src/future/future.rs Outdated

@camelidcamelidAug 27, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@pietroalbini This line is generating a merge conflict so I'm going to rebase this and have this line be the same as master. Is that correct? Also, is there a section in the docs you can point me to on why this is changed at release time?

@emilyalbiniemilyalbiniAug 27, 2020

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.

Some documentation on why cfg(boostrap) and cfg(not(bootstrap)) are needed is on the rustc-dev-guide. That line should become:

#[lang = "poll"]

@camelidcamelidAug 27, 2020

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

So was this a just-stabilized feature then?

@camelid
camelidforce-pushed the intra-doc-links-for-future-and-dec2flt branch from da3b740 to 707298dCompareAugust 27, 2020 18:42
@camelid

camelid commented Aug 27, 2020

Copy link
Copy Markdown
MemberAuthor

Rebased.

jyn514
jyn514 approved these changes Aug 28, 2020
View reviewed changes

@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.

r=me with nit fixed

Comment threadlibrary/core/src/future/future.rs Outdated
@jyn514jyn514 assigned jyn514 and unassigned sfacklerAug 28, 2020
@camelidJoshua Nelson
Remove unnecessary intra-doc link
39cd184
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
@jyn514

jyn514 commented Aug 28, 2020

Copy link
Copy Markdown
Member

@bors r+ rollup

@camelid if you find time to squash the commits that would be nice, but it's fine if not.

@bors

bors commented Aug 28, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 39cd184 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 28, 2020
@emilyalbiniemilyalbini 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 ofrust-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 e027b57 into rust-lang:masterAug 28, 2020
@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

Reviewers

@emilyalbiniemilyalbiniemilyalbini left review comments
+1 more reviewer
@jyn514jyn514jyn514 approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@jyn514jyn514

Labels

A-docsArea: Documentation for any part of the project, including the compiler, standard library, and toolsA-intra-doc-linksArea: Intra-doc links, the ability to link to items in docs by nameS-waiting-on-borsStatus: 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.

8 participants

@camelid@rust-highfive@bors@jyn514@emilyalbini@cuviper@sfackler@rustbot