Skip to content

Commit c601714

Browse files
authored
Rollup merge of #75969 - nixphix:docs/mod, r=jyn514
Switch to intra-doc links in core/src/{convert,iter}/mod.rs Partial fix for #75080 @rustbot modify labels: T-doc, A-intra-doc-links, T-rustdoc r? @jyn514 couldn't fix these ```rust ../../std/string/struct.String.html ../../std/primitive.never.html ../../std/sync/mpsc/struct.TryIter.html ```
2 parents 6c44bcc + 523fea4 commit c601714

File tree

2 files changed

+24
-50
lines changed

2 files changed

+24
-50
lines changed

library/core/src/convert/mod.rs

+14-38
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@
3131
//! `into` themselves and `from` themselves
3232
//!
3333
//! See each trait for usage examples.
34-
//!
35-
//! [`Into`]: trait.Into.html
36-
//! [`From`]: trait.From.html
37-
//! [`TryFrom`]: trait.TryFrom.html
38-
//! [`TryInto`]: trait.TryInto.html
39-
//! [`AsRef`]: trait.AsRef.html
40-
//! [`AsMut`]: trait.AsMut.html
4134
4235
#![stable(feature = "rust1", since = "1.0.0")]
4336

@@ -141,13 +134,11 @@ pub const fn identity<T>(x: T) -> T {
141134
/// want to accept all references that can be converted to [`&str`] as an argument.
142135
/// Since both [`String`] and [`&str`] implement `AsRef<str>` we can accept both as input argument.
143136
///
144-
/// [`Option<T>`]: ../../std/option/enum.Option.html
145-
/// [`Result<T, E>`]: ../../std/result/enum.Result.html
146-
/// [`Borrow`]: ../../std/borrow/trait.Borrow.html
147-
/// [`Hash`]: ../../std/hash/trait.Hash.html
148-
/// [`Eq`]: ../../std/cmp/trait.Eq.html
149-
/// [`Ord`]: ../../std/cmp/trait.Ord.html
150-
/// [`&str`]: ../../std/primitive.str.html
137+
/// [`Option<T>`]: Option
138+
/// [`Result<T, E>`]: Result
139+
/// [`Borrow`]: crate::borrow::Borrow
140+
/// [`Eq`]: crate::cmp::Eq
141+
/// [`Ord`]: crate::cmp::Ord
151142
/// [`String`]: ../../std/string/struct.String.html
152143
///
153144
/// ```
@@ -177,8 +168,8 @@ pub trait AsRef<T: ?Sized> {
177168
/// **Note: This trait must not fail**. If the conversion can fail, use a
178169
/// dedicated method which returns an [`Option<T>`] or a [`Result<T, E>`].
179170
///
180-
/// [`Option<T>`]: ../../std/option/enum.Option.html
181-
/// [`Result<T, E>`]: ../../std/result/enum.Result.html
171+
/// [`Option<T>`]: Option
172+
/// [`Result<T, E>`]: Result
182173
///
183174
/// # Generic Implementations
184175
///
@@ -278,12 +269,9 @@ pub trait AsMut<T: ?Sized> {
278269
/// is_hello(s);
279270
/// ```
280271
///
281-
/// [`TryInto`]: trait.TryInto.html
282-
/// [`Option<T>`]: ../../std/option/enum.Option.html
283-
/// [`Result<T, E>`]: ../../std/result/enum.Result.html
272+
/// [`Option<T>`]: Option
273+
/// [`Result<T, E>`]: Result
284274
/// [`String`]: ../../std/string/struct.String.html
285-
/// [`From`]: trait.From.html
286-
/// [`Into`]: trait.Into.html
287275
/// [`Vec`]: ../../std/vec/struct.Vec.html
288276
#[stable(feature = "rust1", since = "1.0.0")]
289277
pub trait Into<T>: Sized {
@@ -370,12 +358,10 @@ pub trait Into<T>: Sized {
370358
/// }
371359
/// ```
372360
///
373-
/// [`TryFrom`]: trait.TryFrom.html
374-
/// [`Option<T>`]: ../../std/option/enum.Option.html
375-
/// [`Result<T, E>`]: ../../std/result/enum.Result.html
361+
/// [`Option<T>`]: Option
362+
/// [`Result<T, E>`]: Result
376363
/// [`String`]: ../../std/string/struct.String.html
377-
/// [`Into`]: trait.Into.html
378-
/// [`from`]: trait.From.html#tymethod.from
364+
/// [`from`]: From::from
379365
/// [book]: ../../book/ch09-00-error-handling.html
380366
#[rustc_diagnostic_item = "from_trait"]
381367
#[stable(feature = "rust1", since = "1.0.0")]
@@ -404,9 +390,6 @@ pub trait From<T>: Sized {
404390
///
405391
/// This suffers the same restrictions and reasoning as implementing
406392
/// [`Into`], see there for details.
407-
///
408-
/// [`TryFrom`]: trait.TryFrom.html
409-
/// [`Into`]: trait.Into.html
410393
#[stable(feature = "try_from", since = "1.34.0")]
411394
pub trait TryInto<T>: Sized {
412395
/// The type returned in the event of a conversion error.
@@ -485,11 +468,9 @@ pub trait TryInto<T>: Sized {
485468
/// assert!(try_successful_smaller_number.is_ok());
486469
/// ```
487470
///
488-
/// [`try_from`]: trait.TryFrom.html#tymethod.try_from
489-
/// [`TryInto`]: trait.TryInto.html
490-
/// [`i32::MAX`]: ../../std/i32/constant.MAX.html
471+
/// [`i32::MAX`]: crate::i32::MAX
472+
/// [`try_from`]: TryFrom::try_from
491473
/// [`!`]: ../../std/primitive.never.html
492-
/// [`Infallible`]: enum.Infallible.html
493474
#[stable(feature = "try_from", since = "1.34.0")]
494475
pub trait TryFrom<T>: Sized {
495476
/// The type returned in the event of a conversion error.
@@ -676,7 +657,6 @@ impl AsRef<str> for str {
676657
///
677658
/// … and eventually deprecate `Infallible`.
678659
///
679-
///
680660
/// However there is one case where `!` syntax can be used
681661
/// before `!` is stabilized as a full-fledged type: in the position of a function’s return type.
682662
/// Specifically, it is possible implementations for two different function pointer types:
@@ -692,10 +672,6 @@ impl AsRef<str> for str {
692672
/// the two `impl`s will start to overlap
693673
/// and therefore will be disallowed by the language’s trait coherence rules.
694674
///
695-
/// [`Ok`]: ../result/enum.Result.html#variant.Ok
696-
/// [`Result`]: ../result/enum.Result.html
697-
/// [`TryFrom`]: trait.TryFrom.html
698-
/// [`Into`]: trait.Into.html
699675
/// [never]: ../../std/primitive.never.html
700676
#[stable(feature = "convert_infallible", since = "1.34.0")]
701677
#[derive(Copy)]

library/core/src/iter/mod.rs

+10-12
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
//! below for more details.
5555
//!
5656
//! [`Some(Item)`]: Some
57-
//! [`Iterator`]: trait.Iterator.html
58-
//! [`next`]: trait.Iterator.html#tymethod.next
57+
//! [`next`]: Iterator::next
5958
//! [`TryIter`]: ../../std/sync/mpsc/struct.TryIter.html
6059
//!
6160
//! # The three forms of iteration
@@ -159,8 +158,7 @@
159158
//! Let's take a look at that `for` loop again, and what the compiler converts
160159
//! it into:
161160
//!
162-
//! [`IntoIterator`]: trait.IntoIterator.html
163-
//! [`into_iter`]: trait.IntoIterator.html#tymethod.into_iter
161+
//! [`into_iter`]: IntoIterator::into_iter
164162
//!
165163
//! ```
166164
//! let values = vec![1, 2, 3, 4, 5];
@@ -222,9 +220,9 @@
222220
//! across versions of Rust, so you should avoid relying on the exact values
223221
//! returned by an iterator which panicked.
224222
//!
225-
//! [`map`]: trait.Iterator.html#method.map
226-
//! [`take`]: trait.Iterator.html#method.take
227-
//! [`filter`]: trait.Iterator.html#method.filter
223+
//! [`map`]: Iterator::map
224+
//! [`take`]: Iterator::take
225+
//! [`filter`]: Iterator::filter
228226
//!
229227
//! # Laziness
230228
//!
@@ -261,13 +259,13 @@
261259
//! }
262260
//! ```
263261
//!
264-
//! [`map`]: trait.Iterator.html#method.map
265-
//! [`for_each`]: trait.Iterator.html#method.for_each
262+
//! [`map`]: Iterator::map
263+
//! [`for_each`]: Iterator::for_each
266264
//!
267265
//! Another common way to evaluate an iterator is to use the [`collect`]
268266
//! method to produce a new collection.
269267
//!
270-
//! [`collect`]: trait.Iterator.html#method.collect
268+
//! [`collect`]: Iterator::collect
271269
//!
272270
//! # Infinity
273271
//!
@@ -305,8 +303,8 @@
305303
//! println!("The smallest number one is {}.", least);
306304
//! ```
307305
//!
308-
//! [`take`]: trait.Iterator.html#method.take
309-
//! [`min`]: trait.Iterator.html#method.min
306+
//! [`take`]: Iterator::take
307+
//! [`min`]: Iterator::min
310308
311309
#![stable(feature = "rust1", since = "1.0.0")]
312310

0 commit comments

Comments
 (0)