diff options
| author | Kyle Lin <minecraft.kyle.train@gmail.com> | 2023-07-03 10:30:29 +0800 |
|---|---|---|
| committer | Kyle Lin <minecraft.kyle.train@gmail.com> | 2023-08-18 15:22:58 +0800 |
| commit | c4afb8a8684aceabf54030c7e2648494d3c9bbe2 (patch) | |
| tree | d6a33674383f303f2a00caef0659b41f3a0f4ddb | |
| parent | 2ec3e297ab054054d428d7d28666b95484b57fc0 (diff) | |
| download | rust-c4afb8a8684aceabf54030c7e2648494d3c9bbe2.tar.gz rust-c4afb8a8684aceabf54030c7e2648494d3c9bbe2.zip | |
resolve conflicts
| -rw-r--r-- | library/core/src/lib.rs | 2 | ||||
| -rw-r--r-- | library/core/src/primitive_docs.rs | 2 | ||||
| -rw-r--r-- | library/std/src/primitive_docs.rs | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs index 48c3c1f2123..a2729b3743c 100644 --- a/library/core/src/lib.rs +++ b/library/core/src/lib.rs @@ -97,6 +97,8 @@ #![allow(incomplete_features)] #![warn(multiple_supertrait_upcastable)] #![cfg_attr(not(bootstrap), allow(internal_features))] +// Do not check link redundancy on bootstraping phase +#![cfg_attr(not(bootstrap), allow(rustdoc::redundant_explicit_links))] // // Library features: // tidy-alphabetical-start diff --git a/library/core/src/primitive_docs.rs b/library/core/src/primitive_docs.rs index 7180236fb22..80289ca08c3 100644 --- a/library/core/src/primitive_docs.rs +++ b/library/core/src/primitive_docs.rs @@ -624,7 +624,7 @@ mod prim_pointer {} /// array implementations) succeed if the input slice length is the same as the result /// array length. They optimize especially well when the optimizer can easily determine /// the slice length, e.g. `<[u8; 4]>::try_from(&slice[4..8]).unwrap()`. Array implements -/// [TryFrom] returning: +/// [TryFrom](crate::convert::TryFrom) returning: /// /// - `[T; N]` copies from the slice's elements /// - `&[T; N]` references the original slice's elements diff --git a/library/std/src/primitive_docs.rs b/library/std/src/primitive_docs.rs index 7180236fb22..80289ca08c3 100644 --- a/library/std/src/primitive_docs.rs +++ b/library/std/src/primitive_docs.rs @@ -624,7 +624,7 @@ mod prim_pointer {} /// array implementations) succeed if the input slice length is the same as the result /// array length. They optimize especially well when the optimizer can easily determine /// the slice length, e.g. `<[u8; 4]>::try_from(&slice[4..8]).unwrap()`. Array implements -/// [TryFrom] returning: +/// [TryFrom](crate::convert::TryFrom) returning: /// /// - `[T; N]` copies from the slice's elements /// - `&[T; N]` references the original slice's elements |