diff options
| author | bors <bors@rust-lang.org> | 2015-09-30 17:12:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-30 17:12:08 +0000 |
| commit | dcb167e14784edff2021869b92dff4dd585e64a2 (patch) | |
| tree | b24a48399820937a6f298dea2cacde09a4433de3 /src/libstd | |
| parent | 437d70a54b2000cd1911b5d5c53ff18124581d18 (diff) | |
| parent | 2c4b89ca99d6f315119a72379ef476f7a23bcad7 (diff) | |
| download | rust-dcb167e14784edff2021869b92dff4dd585e64a2.tar.gz rust-dcb167e14784edff2021869b92dff4dd585e64a2.zip | |
Auto merge of #28758 - Manishearth:rollup, r=Manishearth
- Successful merges: #28743, #28744, #28745, #28749 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/path.rs | 3 | ||||
| -rw-r--r-- | src/libstd/primitive_docs.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/path.rs b/src/libstd/path.rs index 8eb5d1f2726..43c2766782e 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -351,7 +351,6 @@ impl<'a> Prefix<'a> { /// ``` #[stable(feature = "rust1", since = "1.0.0")] pub fn is_separator(c: char) -> bool { - use ascii::*; c.is_ascii() && is_sep_byte(c as u8) } @@ -1292,7 +1291,7 @@ impl Path { /// use std::path::Path; /// /// let path_str = Path::new("foo.txt").to_str(); - //// assert_eq!(path_str, Some("foo.txt")); + /// assert_eq!(path_str, Some("foo.txt")); /// ``` #[stable(feature = "rust1", since = "1.0.0")] pub fn to_str(&self) -> Option<&str> { diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index f2ae168e560..7d62d477a0a 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -411,7 +411,7 @@ mod prim_isize { } #[doc(primitive = "usize")] // -/// The pointer-sized signed integer type. +/// The pointer-sized unsigned integer type. /// /// *[See also the `std::usize` module](usize/index.html).* /// |
