Use intra-doc links in core::future::future and core::num::dec2flt#75955
Merged
bors merged 3 commits intorust-lang:masterfrom Aug 28, 2020
Merged
Use intra-doc links in core::future::future and core::num::dec2flt#75955bors merged 3 commits intorust-lang:masterfrom
core::future::future and core::num::dec2flt#75955bors merged 3 commits intorust-lang:masterfrom
Conversation
rustbot
added
A-intra-doc-links
Contributor
|
r? @sfackler (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Collaborator
|
☔ The latest upstream changes (presumably #75947) made this pull request unmergeable. Please resolve the merge conflicts. |
camelid
commented
Aug 27, 2020
library/core/src/future/future.rs
Outdated
Member
Author
There was a problem hiding this comment.
@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?
Member
There was a problem hiding this comment.
Some documentation on why cfg(boostrap) and cfg(not(bootstrap)) are needed is on the rustc-dev-guide. That line should become:
#[lang = "poll"]
Member
Author
There was a problem hiding this comment.
So was this a just-stabilized feature then?
camelid
force-pushed
the
intra-doc-links-for-future-and-dec2flt
branch
from
da3b740 to
707298d
Compare
Member
Author
|
Rebased. |
Co-authored-by: Joshua Nelson <joshua@yottadb.com>
Member
Collaborator
|
📌 Commit 39cd184 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 28, 2020
…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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #75080.
@rustbot modify labels: A-intra-doc-links T-doc