Skip to content

Commit 6d84d36

Browse files
committed
Auto merge of rust-lang#109001 - matthiaskrgr:rollup-a3agnwp, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#105798 (Relax ordering rules for `asm!` operands) - rust-lang#105962 (Stabilize path_as_mut_os_str) - rust-lang#106085 (use problem matchers for tidy CI) - rust-lang#107711 (Stabilize movbe target feature) - rust-lang#108017 (Add `--no-undefined-version` link flag and fix associated breakage) - rust-lang#108891 (Remove an extraneous include) - rust-lang#108902 (no more do while :<) - rust-lang#108912 (Document tool lints) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents d924658 + ce739a9 commit 6d84d36

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

std/src/path.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,6 @@ impl PathBuf {
14981498
/// # Examples
14991499
///
15001500
/// ```
1501-
/// #![feature(path_as_mut_os_str)]
15021501
/// use std::path::{Path, PathBuf};
15031502
///
15041503
/// let mut path = PathBuf::from("/foo");
@@ -1510,7 +1509,7 @@ impl PathBuf {
15101509
/// path.as_mut_os_string().push("baz");
15111510
/// assert_eq!(path, Path::new("/foo/barbaz"));
15121511
/// ```
1513-
#[unstable(feature = "path_as_mut_os_str", issue = "105021")]
1512+
#[stable(feature = "path_as_mut_os_str", since = "CURRENT_RUSTC_VERSION")]
15141513
#[must_use]
15151514
#[inline]
15161515
pub fn as_mut_os_string(&mut self) -> &mut OsString {
@@ -2066,7 +2065,6 @@ impl Path {
20662065
/// # Examples
20672066
///
20682067
/// ```
2069-
/// #![feature(path_as_mut_os_str)]
20702068
/// use std::path::{Path, PathBuf};
20712069
///
20722070
/// let mut path = PathBuf::from("Foo.TXT");
@@ -2076,7 +2074,7 @@ impl Path {
20762074
/// path.as_mut_os_str().make_ascii_lowercase();
20772075
/// assert_eq!(path, Path::new("foo.txt"));
20782076
/// ```
2079-
#[unstable(feature = "path_as_mut_os_str", issue = "105021")]
2077+
#[stable(feature = "path_as_mut_os_str", since = "CURRENT_RUSTC_VERSION")]
20802078
#[must_use]
20812079
#[inline]
20822080
pub fn as_mut_os_str(&mut self) -> &mut OsStr {

0 commit comments

Comments
 (0)