Skip to content

Commit 25d0864

Browse files
committed
Auto merge of rust-lang#141379 - matthiaskrgr:rollup-g1cz0ic, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#140431 (dont handle bool transmute) - rust-lang#140868 (rustdoc: Fix links with inline code in trait impl docs) - rust-lang#141323 (Add bors environment to CI) - rust-lang#141337 (bump stdarch) - rust-lang#141364 (rustdoc-json: Remove false docs and add test for inline attribute) - rust-lang#141370 (add doc alias `replace_first` for `str::replacen`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6669d52 + dc9f842 commit 25d0864

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

alloc/src/str.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ impl str {
320320
/// ```
321321
#[cfg(not(no_global_oom_handling))]
322322
#[rustc_allow_incoherent_impl]
323+
#[doc(alias = "replace_first")]
323324
#[must_use = "this returns the replaced string as a new allocation, \
324325
without modifying the original"]
325326
#[stable(feature = "str_replacen", since = "1.16.0")]

stdarch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 1dfaa4db2479753a46a3e90f2c3c89d89d0b21f1
1+
Subproject commit b6e2249e388f520627544812649b77b0944e1a2e

0 commit comments

Comments
 (0)