Skip to content

Commit c4afb8a

Browse files
committed
resolve conflicts
1 parent 2ec3e29 commit c4afb8a

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

library/core/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@
9797
#![allow(incomplete_features)]
9898
#![warn(multiple_supertrait_upcastable)]
9999
#![cfg_attr(not(bootstrap), allow(internal_features))]
100+
// Do not check link redundancy on bootstraping phase
101+
#![cfg_attr(not(bootstrap), allow(rustdoc::redundant_explicit_links))]
100102
//
101103
// Library features:
102104
// tidy-alphabetical-start

library/core/src/primitive_docs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ mod prim_pointer {}
624624
/// array implementations) succeed if the input slice length is the same as the result
625625
/// array length. They optimize especially well when the optimizer can easily determine
626626
/// the slice length, e.g. `<[u8; 4]>::try_from(&slice[4..8]).unwrap()`. Array implements
627-
/// [TryFrom] returning:
627+
/// [TryFrom](crate::convert::TryFrom) returning:
628628
///
629629
/// - `[T; N]` copies from the slice's elements
630630
/// - `&[T; N]` references the original slice's elements

library/std/src/primitive_docs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ mod prim_pointer {}
624624
/// array implementations) succeed if the input slice length is the same as the result
625625
/// array length. They optimize especially well when the optimizer can easily determine
626626
/// the slice length, e.g. `<[u8; 4]>::try_from(&slice[4..8]).unwrap()`. Array implements
627-
/// [TryFrom] returning:
627+
/// [TryFrom](crate::convert::TryFrom) returning:
628628
///
629629
/// - `[T; N]` copies from the slice's elements
630630
/// - `&[T; N]` references the original slice's elements

0 commit comments

Comments
 (0)