Skip to content

Rollup of 7 pull requests #25711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

Rollup of 7 pull requests #25711

Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e161d5c
Stabilize debug builders for 1.2.0
sfackler May 20, 2015
a3c4ce4
Fix ICE trying to pass DST to C functions
dotdash May 20, 2015
65ead71
she -> they in Dining Philosophers
steveklabnik May 21, 2015
3241b48
Use `Self` to simplify
tamird May 21, 2015
cf11c26
Standardize on `$t:ty`
tamird May 21, 2015
5263d62
doc: miscellaneous improvements to std::path::Path examples
tshepang May 21, 2015
5dc03a8
Lazy-load filemaps from external crates.
eddyb May 22, 2015
e790db7
better describe the stdlib
MatejLach May 22, 2015
fc259e0
Rollup merge of #24847 - sfackler:debug-builders-stability, r=aturon
Manishearth May 22, 2015
9441c81
Rollup merge of #25653 - dotdash:unsize_c, r=luqmana
Manishearth May 22, 2015
6657209
Rollup merge of #25666 - tshepang:better-path-docs, r=steveklabnik
Manishearth May 22, 2015
12285ef
Rollup merge of #25681 - steveklabnik:gender, r=nmatsakis
Manishearth May 22, 2015
e510eec
Rollup merge of #25687 - tamird:num-self-cleanup, r=Gankro
Manishearth May 22, 2015
41f2c81
Rollup merge of #25703 - eddyb:lazier-loads, r=pnkfelix
Manishearth May 22, 2015
d9cbea0
Rollup merge of #25709 - MatejLach:stdlib_style, r=steveklabnik
Manishearth May 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 40 additions & 38 deletions src/libstd/path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,9 +1247,10 @@ impl Path {
/// ```
/// use std::path::Path;
///
/// let s = String::from("bar.txt");
/// let p = Path::new(&s);
/// Path::new(&p);
/// let string = String::from("foo.txt");
/// let from_string = Path::new(&string);
/// let from_path = Path::new(&from_string);
/// assert_eq!(from_string, from_path);
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn new<S: AsRef<OsStr> + ?Sized>(s: &S) -> &Path {
Expand All @@ -1264,6 +1265,7 @@ impl Path {
/// use std::path::Path;
///
/// let os_str = Path::new("foo.txt").as_os_str();
/// assert_eq!(os_str, std::ffi::OsStr::new("foo.txt"));
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn as_os_str(&self) -> &OsStr {
Expand All @@ -1280,6 +1282,7 @@ impl Path {
/// use std::path::Path;
///
/// let path_str = Path::new("foo.txt").to_str();
//// assert_eq!(path_str, Some("foo.txt"));
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn to_str(&self) -> Option<&str> {
Expand All @@ -1296,6 +1299,7 @@ impl Path {
/// use std::path::Path;
///
/// let path_str = Path::new("foo.txt").to_string_lossy();
/// assert_eq!(path_str, "foo.txt");
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn to_string_lossy(&self) -> Cow<str> {
Expand All @@ -1309,7 +1313,8 @@ impl Path {
/// ```
/// use std::path::Path;
///
/// let path_str = Path::new("foo.txt").to_path_buf();
/// let path_buf = Path::new("foo.txt").to_path_buf();
/// assert_eq!(path_buf, std::path::PathBuf::from("foo.txt"));
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn to_path_buf(&self) -> PathBuf {
Expand All @@ -1330,7 +1335,7 @@ impl Path {
/// ```
/// use std::path::Path;
///
/// assert_eq!(false, Path::new("foo.txt").is_absolute());
/// assert!(!Path::new("foo.txt").is_absolute());
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn is_absolute(&self) -> bool {
Expand Down Expand Up @@ -1393,14 +1398,12 @@ impl Path {
/// use std::path::Path;
///
/// let path = Path::new("/foo/bar");
/// let foo = path.parent().unwrap();
/// let parent = path.parent().unwrap();
/// assert_eq!(parent, Path::new("/foo"));
///
/// assert!(foo == Path::new("/foo"));
///
/// let root = foo.parent().unwrap();
///
/// assert!(root == Path::new("/"));
/// assert!(root.parent() == None);
/// let grand_parent = parent.parent().unwrap();
/// assert_eq!(grand_parent, Path::new("/"));
/// assert_eq!(grand_parent.parent(), None);
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn parent(&self) -> Option<&Path> {
Expand All @@ -1416,18 +1419,19 @@ impl Path {

/// The final component of the path, if it is a normal file.
///
/// If the path terminates in `.`, `..`, or consists solely or a root of
/// If the path terminates in `.`, `..`, or consists solely of a root of
/// prefix, `file_name` will return `None`.
///
/// # Examples
///
/// ```
/// use std::path::Path;
/// use std::ffi::OsStr;
///
/// let path = Path::new("hello_world.rs");
/// let filename = "hello_world.rs";
/// let path = Path::new("foo.txt");
/// let os_str = OsStr::new("foo.txt");
///
/// assert_eq!(filename, path.file_name().unwrap());
/// assert_eq!(Some(os_str), path.file_name());
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn file_name(&self) -> Option<&OsStr> {
Expand Down Expand Up @@ -1538,11 +1542,9 @@ impl Path {
/// # Examples
///
/// ```
/// use std::path::Path;
///
/// let path = Path::new("/tmp");
/// use std::path::{Path, PathBuf};
///
/// let new_path = path.join("foo");
/// assert_eq!(Path::new("/etc").join("passwd"), PathBuf::from("/etc/passwd"));
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn join<P: AsRef<Path>>(&self, path: P) -> PathBuf {
Expand All @@ -1558,11 +1560,10 @@ impl Path {
/// # Examples
///
/// ```
/// use std::path::Path;
///
/// let path = Path::new("/tmp/foo.rs");
/// use std::path::{Path, PathBuf};
///
/// let new_path = path.with_file_name("bar.rs");
/// let path = Path::new("/tmp/foo.txt");
/// assert_eq!(path.with_file_name("bar.txt"), PathBuf::from("/tmp/bar.txt"));
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn with_file_name<S: AsRef<OsStr>>(&self, file_name: S) -> PathBuf {
Expand All @@ -1580,10 +1581,8 @@ impl Path {
/// ```
/// use std::path::{Path, PathBuf};
///
/// let path = Path::new("/tmp/foo.rs");
///
/// let new_path = path.with_extension("txt");
/// assert_eq!(new_path, PathBuf::from("/tmp/foo.txt"));
/// let path = Path::new("foo.rs");
/// assert_eq!(path.with_extension("txt"), PathBuf::from("foo.txt"));
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn with_extension<S: AsRef<OsStr>>(&self, extension: S) -> PathBuf {
Expand All @@ -1597,13 +1596,15 @@ impl Path {
/// # Examples
///
/// ```
/// use std::path::Path;
/// use std::path::{Path, Component};
/// use std::ffi::OsStr;
///
/// let path = Path::new("/tmp/foo.rs");
/// let mut components = Path::new("/tmp/foo.txt").components();
///
/// for component in path.components() {
/// println!("{:?}", component);
/// }
/// assert_eq!(components.next(), Some(Component::RootDir));
/// assert_eq!(components.next(), Some(Component::Normal(OsStr::new("tmp"))));
/// assert_eq!(components.next(), Some(Component::Normal(OsStr::new("foo.txt"))));
/// assert_eq!(components.next(), None)
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn components(&self) -> Components {
Expand All @@ -1623,12 +1624,13 @@ impl Path {
///
/// ```
/// use std::path::Path;
/// use std::ffi::OsStr;
///
/// let path = Path::new("/tmp/foo.rs");
///
/// for component in path.iter() {
/// println!("{:?}", component);
/// }
/// let mut it = Path::new("/tmp/foo.txt").iter();
/// assert_eq!(it.next(), Some(OsStr::new("/")));
/// assert_eq!(it.next(), Some(OsStr::new("tmp")));
/// assert_eq!(it.next(), Some(OsStr::new("foo.txt")));
/// assert_eq!(it.next(), None)
/// ```
#[stable(feature = "rust1", since = "1.0.0")]
pub fn iter(&self) -> Iter {
Expand Down