Skip to content

Commit 5230979

Browse files
committed
Auto merge of #50894 - teiesti:stabilize_path_ancestors, r=dtolnay
Stabilize std::path::Path::ancestors Closes #48581 r? @BurntSushi
2 parents b36917b + 65d119c commit 5230979

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/libstd/path.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -1042,8 +1042,6 @@ impl<'a> cmp::Ord for Components<'a> {
10421042
/// # Examples
10431043
///
10441044
/// ```
1045-
/// #![feature(path_ancestors)]
1046-
///
10471045
/// use std::path::Path;
10481046
///
10491047
/// let path = Path::new("/foo/bar");
@@ -1056,12 +1054,12 @@ impl<'a> cmp::Ord for Components<'a> {
10561054
/// [`ancestors`]: struct.Path.html#method.ancestors
10571055
/// [`Path`]: struct.Path.html
10581056
#[derive(Copy, Clone, Debug)]
1059-
#[unstable(feature = "path_ancestors", issue = "48581")]
1057+
#[stable(feature = "path_ancestors", since = "1.28.0")]
10601058
pub struct Ancestors<'a> {
10611059
next: Option<&'a Path>,
10621060
}
10631061

1064-
#[unstable(feature = "path_ancestors", issue = "48581")]
1062+
#[stable(feature = "path_ancestors", since = "1.28.0")]
10651063
impl<'a> Iterator for Ancestors<'a> {
10661064
type Item = &'a Path;
10671065

@@ -1075,7 +1073,7 @@ impl<'a> Iterator for Ancestors<'a> {
10751073
}
10761074
}
10771075

1078-
#[unstable(feature = "path_ancestors", issue = "48581")]
1076+
#[stable(feature = "path_ancestors", since = "1.28.0")]
10791077
impl<'a> FusedIterator for Ancestors<'a> {}
10801078

10811079
////////////////////////////////////////////////////////////////////////////////
@@ -1890,8 +1888,6 @@ impl Path {
18901888
/// # Examples
18911889
///
18921890
/// ```
1893-
/// #![feature(path_ancestors)]
1894-
///
18951891
/// use std::path::Path;
18961892
///
18971893
/// let mut ancestors = Path::new("/foo/bar").ancestors();
@@ -1903,7 +1899,7 @@ impl Path {
19031899
///
19041900
/// [`None`]: ../../std/option/enum.Option.html#variant.None
19051901
/// [`parent`]: struct.Path.html#method.parent
1906-
#[unstable(feature = "path_ancestors", issue = "48581")]
1902+
#[stable(feature = "path_ancestors", since = "1.28.0")]
19071903
pub fn ancestors(&self) -> Ancestors {
19081904
Ancestors {
19091905
next: Some(&self),

0 commit comments

Comments
 (0)