Skip to content

Commit 474ee04

Browse files
author
Ulrik Sverdrup
committed
---
yaml --- r: 192127 b: refs/heads/snap-stage3 c: 00e14f1 h: refs/heads/master i: 192125: 07cdf6d 192123: c3c7fef 192119: 4b551c5 192111: 77bfc66 192095: 0584538 192063: 79f4690 191999: e6d8ade v: v3
1 parent ffae96b commit 474ee04

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 809a554fca2d0ebc2ba50077016fe282a4064752
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 227d30414ca88aad644ea4fde2c33852b1fd6ad9
4+
refs/heads/snap-stage3: 00e14f16225fcf529b6d8a20c4c000d803064ec8
55
refs/heads/try: ce76bff75603a754d092456285ff455eb871633d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/libcollections/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
//! are owned elsewhere.
2020
//!
2121
//! Basic operations are implemented directly by the compiler, but more advanced
22-
//! operations are defined on the [`StrExt`](trait.StrExt.html) trait.
22+
//! operations are defined as methods on the `str` type.
2323
//!
2424
//! # Examples
2525
//!

branches/snap-stage3/src/libcore/str/mod.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,7 @@ impl FromStr for bool {
164164
/// assert!(<bool as FromStr>::from_str("not even a boolean").is_err());
165165
/// ```
166166
///
167-
/// Note, in many cases, the StrExt::parse() which is based on
168-
/// this FromStr::from_str() is more proper.
167+
/// Note, in many cases, the `.parse()` method on `str` is more proper.
169168
///
170169
/// ```
171170
/// assert_eq!("true".parse(), Ok(true));
@@ -530,7 +529,7 @@ impl<'a> DoubleEndedIterator for CharIndices<'a> {
530529
/// External iterator for a string's bytes.
531530
/// Use with the `std::iter` module.
532531
///
533-
/// Created with `StrExt::bytes`
532+
/// Created with `str::bytes`
534533
#[stable(feature = "rust1", since = "1.0.0")]
535534
#[derive(Clone)]
536535
pub struct Bytes<'a>(Map<slice::Iter<'a, u8>, BytesDeref>);
@@ -1461,27 +1460,27 @@ impl<'a, S: ?Sized> Str for &'a S where S: Str {
14611460
fn as_slice(&self) -> &str { Str::as_slice(*self) }
14621461
}
14631462

1464-
/// Return type of `StrExt::split`
1463+
/// Return type of `str::split`
14651464
#[stable(feature = "rust1", since = "1.0.0")]
14661465
pub struct Split<'a, P: Pattern<'a>>(CharSplits<'a, P>);
14671466
delegate_iter!{pattern &'a str : Split<'a, P>}
14681467

1469-
/// Return type of `StrExt::split_terminator`
1468+
/// Return type of `str::split_terminator`
14701469
#[stable(feature = "rust1", since = "1.0.0")]
14711470
pub struct SplitTerminator<'a, P: Pattern<'a>>(CharSplits<'a, P>);
14721471
delegate_iter!{pattern &'a str : SplitTerminator<'a, P>}
14731472

1474-
/// Return type of `StrExt::splitn`
1473+
/// Return type of `str::splitn`
14751474
#[stable(feature = "rust1", since = "1.0.0")]
14761475
pub struct SplitN<'a, P: Pattern<'a>>(CharSplitsN<'a, P>);
14771476
delegate_iter!{pattern forward &'a str : SplitN<'a, P>}
14781477

1479-
/// Return type of `StrExt::rsplit`
1478+
/// Return type of `str::rsplit`
14801479
#[stable(feature = "rust1", since = "1.0.0")]
14811480
pub struct RSplit<'a, P: Pattern<'a>>(RCharSplits<'a, P>);
14821481
delegate_iter!{pattern reverse &'a str : RSplit<'a, P>}
14831482

1484-
/// Return type of `StrExt::rsplitn`
1483+
/// Return type of `str::rsplitn`
14851484
#[stable(feature = "rust1", since = "1.0.0")]
14861485
pub struct RSplitN<'a, P: Pattern<'a>>(RCharSplitsN<'a, P>);
14871486
delegate_iter!{pattern reverse &'a str : RSplitN<'a, P>}

0 commit comments

Comments
 (0)