Skip to content

Commit a05ed99

Browse files
committed
std: Remove two internal str_internals functions
These were just exposed to be used elsewhere at some point, but neither is currently being used so just make them private again.
1 parent f55c366 commit a05ed99

File tree

2 files changed

+2
-29
lines changed

2 files changed

+2
-29
lines changed

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
}

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)