Skip to content

Commit d41d1f5

Browse files
committed
---
yaml --- r: 123698 b: refs/heads/try c: 3c7f619 h: refs/heads/master v: v3
1 parent 15e4fae commit d41d1f5

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: da4e4e4e0a7778a85748aa4a303b13f603e96b4b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 8ddd286ea4ba4384a0dc9eae393ed515460a986e
5-
refs/heads/try: c2dd553bed572368953801dd1d339013f58b53d6
5+
refs/heads/try: 3c7f619b76b87c400e270eebfa7625844afcd673
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/str.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,7 +1764,9 @@ impl<'a> StrSlice<'a> for &'a str {
17641764

17651765
#[inline]
17661766
fn slice(&self, begin: uint, end: uint) -> &'a str {
1767-
assert!(self.is_char_boundary(begin) && self.is_char_boundary(end));
1767+
assert!(self.is_char_boundary(begin) && self.is_char_boundary(end),
1768+
"index {} and/or {} in `{}` do not lie on character boundary", begin,
1769+
end, *self);
17681770
unsafe { raw::slice_bytes(*self, begin, end) }
17691771
}
17701772

@@ -1775,7 +1777,8 @@ impl<'a> StrSlice<'a> for &'a str {
17751777

17761778
#[inline]
17771779
fn slice_to(&self, end: uint) -> &'a str {
1778-
assert!(self.is_char_boundary(end));
1780+
assert!(self.is_char_boundary(end), "index {} in `{}` does not lie on \
1781+
a character boundary", end, *self);
17791782
unsafe { raw::slice_bytes(*self, 0, end) }
17801783
}
17811784

0 commit comments

Comments
 (0)