resolve conflicts
This commit is contained in:
parent
2ec3e297ab
commit
c4afb8a868
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user