Skip to content

Commit f5ad5a1

Browse files
committed
---
yaml --- r: 212990 b: refs/heads/master c: a05ed99 h: refs/heads/master v: v3
1 parent 7e3c60c commit f5ad5a1

File tree

3 files changed

+3
-30
lines changed

3 files changed

+3
-30
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: f55c366a8ac33307859ae6190d2788270a885f90
2+
refs/heads/master: a05ed9936d97414efdfd460f1e25505c366689d3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
55
refs/heads/try: 1864973ae17213c5a58c4dd3f9af6d1b6c7d2e05

trunk/src/libcore/str/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,8 @@ pub fn next_code_point(bytes: &mut slice::Iter<u8>) -> Option<u32> {
227227

228228
/// Reads the last code point out of a byte iterator (assuming a
229229
/// UTF-8-like encoding).
230-
#[unstable(feature = "str_internals")]
231230
#[inline]
232-
pub fn next_code_point_reverse(bytes: &mut slice::Iter<u8>) -> Option<u32> {
231+
fn next_code_point_reverse(bytes: &mut slice::Iter<u8>) -> Option<u32> {
233232
// Decode UTF-8
234233
let w = match bytes.next_back() {
235234
None => return None,
@@ -1873,8 +1872,7 @@ impl AsRef<[u8]> for str {
18731872
/// Pluck a code point out of a UTF-8-like byte slice and return the
18741873
/// index of the next code point.
18751874
#[inline]
1876-
#[unstable(feature = "str_internals")]
1877-
pub fn char_range_at_raw(bytes: &[u8], i: usize) -> (u32, usize) {
1875+
fn char_range_at_raw(bytes: &[u8], i: usize) -> (u32, usize) {
18781876
if bytes[i] < 128 {
18791877
return (bytes[i] as u32, i + 1);
18801878
}

trunk/src/libstd/sys/common/wtf8.rs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -480,31 +480,6 @@ impl Wtf8 {
480480
}
481481
}
482482

483-
/// Returns the code point at `position`.
484-
///
485-
/// # Panics
486-
///
487-
/// Panics if `position` is not at a code point boundary,
488-
/// or is beyond the end of the string.
489-
#[inline]
490-
pub fn code_point_at(&self, position: usize) -> CodePoint {
491-
let (code_point, _) = self.code_point_range_at(position);
492-
code_point
493-
}
494-
495-
/// Returns the code point at `position`
496-
/// and the position of the next code point.
497-
///
498-
/// # Panics
499-
///
500-
/// Panics if `position` is not at a code point boundary,
501-
/// or is beyond the end of the string.
502-
#[inline]
503-
pub fn code_point_range_at(&self, position: usize) -> (CodePoint, usize) {
504-
let (c, n) = char_range_at_raw(&self.bytes, position);
505-
(CodePoint { value: c }, n)
506-
}
507-
508483
/// Returns an iterator for the string’s code points.
509484
#[inline]
510485
pub fn code_points(&self) -> Wtf8CodePoints {

0 commit comments

Comments
 (0)