Skip to content

Commit 445a461

Browse files
committed
Auto merge of rust-lang#90347 - matthiaskrgr:rollup-rp2ms7j, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang#90239 (Consistent big O notation in map.rs) - rust-lang#90267 (fix: inner attribute followed by outer attribute causing ICE) - rust-lang#90288 (Add hint for people missing `TryFrom`, `TryInto`, `FromIterator` import pre-2021) - rust-lang#90304 (Add regression test for rust-lang#75961) - rust-lang#90344 (Add tracking issue number to const_cstr_unchecked) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 9e07477 + 85b297d commit 445a461

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

alloc/src/collections/btree/map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub(super) const MIN_LEN: usize = node::MIN_LEN_AFTER_SPLIT;
5555
/// performance on *small* nodes of elements which are cheap to compare. However in the future we
5656
/// would like to further explore choosing the optimal search strategy based on the choice of B,
5757
/// and possibly other factors. Using linear search, searching for a random element is expected
58-
/// to take O(B * log(n)) comparisons, which is generally worse than a BST. In practice,
58+
/// to take B * log(n) comparisons, which is generally worse than a BST. In practice,
5959
/// however, performance is excellent.
6060
///
6161
/// It is a logic error for a key to be modified in such a way that the key's ordering relative to

std/src/ffi/c_str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1257,7 +1257,7 @@ impl CStr {
12571257
#[inline]
12581258
#[must_use]
12591259
#[stable(feature = "cstr_from_bytes", since = "1.10.0")]
1260-
#[rustc_const_unstable(feature = "const_cstr_unchecked", issue = "none")]
1260+
#[rustc_const_unstable(feature = "const_cstr_unchecked", issue = "90343")]
12611261
pub const unsafe fn from_bytes_with_nul_unchecked(bytes: &[u8]) -> &CStr {
12621262
// SAFETY: Casting to CStr is safe because its internal representation
12631263
// is a [u8] too (safe only inside std).

0 commit comments

Comments
 (0)