nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-19 18:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #75955 - camelid:intra-doc-links-for-future-and-dec2flt, r=jyn514

Browse Source 
Use intra-doc links in `core::future::future` and `core::num::dec2flt`

Part of #75080.

@rustbot modify labels: A-intra-doc-links T-doc
This commit is contained in:
Pietro Albini 2020-08-28 10:24:02 +02:00 committed by GitHub
commit e027b57e40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/core/src/future/future.rs
View File

@ -23,7 +23,7 @@ use crate::task::{Context, Poll};
/// When using a future, you generally won't call `poll` directly, but instead /// When using a future, you generally won't call `poll` directly, but instead
/// `.await` the value. /// `.await` the value.
/// ///
/// [`Waker`]: ../task/struct.Waker.html /// [`Waker`]: crate::task::Waker
#[doc(spotlight)] #[doc(spotlight)]
#[must_use = "futures do nothing unless you `.await` or poll them"] #[must_use = "futures do nothing unless you `.await` or poll them"]
#[stable(feature = "futures_api", since = "1.36.0")] #[stable(feature = "futures_api", since = "1.36.0")]
@ -91,11 +91,9 @@ pub trait Future {
/// (memory corruption, incorrect use of `unsafe` functions, or the like), /// (memory corruption, incorrect use of `unsafe` functions, or the like),
/// regardless of the future's state. /// regardless of the future's state.
/// ///
/// [`Poll::Pending`]: ../task/enum.Poll.html#variant.Pending /// [`Poll::Ready(val)`]: Poll::Ready
/// [`Poll::Ready(val)`]: ../task/enum.Poll.html#variant.Ready /// [`Waker`]: crate::task::Waker
/// [`Context`]: ../task/struct.Context.html /// [`Waker::wake`]: crate::task::Waker::wake
/// [`Waker`]: ../task/struct.Waker.html
/// [`Waker::wake`]: ../task/struct.Waker.html#method.wake
#[lang = "poll"] #[lang = "poll"]
#[stable(feature = "futures_api", since = "1.36.0")] #[stable(feature = "futures_api", since = "1.36.0")]
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output>; fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output>;

4
library/core/src/num/dec2flt/mod.rs
View File

@ -166,10 +166,6 @@ from_str_float_impl!(f64);
/// ///
/// This error is used as the error type for the [`FromStr`] implementation /// This error is used as the error type for the [`FromStr`] implementation
/// for [`f32`] and [`f64`]. /// for [`f32`] and [`f64`].
///
/// [`FromStr`]: ../str/trait.FromStr.html
/// [`f32`]: ../../std/primitive.f32.html
/// [`f64`]: ../../std/primitive.f64.html
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub struct ParseFloatError { pub struct ParseFloatError {