mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Kyle Lin 2023-07-03 10:30:29 +08:00
parent 2ec3e297ab
commit c4afb8a868
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/core/src/lib.rs
View File

@ -97,6 +97,8 @@
#![allow(incomplete_features)] #![allow(incomplete_features)]
#![warn(multiple_supertrait_upcastable)] #![warn(multiple_supertrait_upcastable)]
#![cfg_attr(not(bootstrap), allow(internal_features))] #![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: // Library features:
// tidy-alphabetical-start // tidy-alphabetical-start

2
library/core/src/primitive_docs.rs
View File

@ -624,7 +624,7 @@ mod prim_pointer {}
/// array implementations) succeed if the input slice length is the same as the result /// 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 /// 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 /// 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]` copies from the slice's elements
/// - `&[T; N]` references the original slice's elements /// - `&[T; N]` references the original slice's elements

2
library/std/src/primitive_docs.rs
View File

@ -624,7 +624,7 @@ mod prim_pointer {}
/// array implementations) succeed if the input slice length is the same as the result /// 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 /// 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 /// 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]` copies from the slice's elements
/// - `&[T; N]` references the original slice's elements /// - `&[T; N]` references the original slice's elements