nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 08:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: Remove two internal str_internals functions

Browse Source 
These were just exposed to be used elsewhere at some point, but neither is
currently being used so just make them private again.
This commit is contained in:
Alex Crichton 2015-06-10 18:10:12 -07:00
parent f55c366a8a
commit a05ed9936d
2 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcore/str/mod.rs
View File

@ -227,9 +227,8 @@ pub fn next_code_point(bytes: &mut slice::Iter<u8>) -> Option<u32> {
/// Reads the last code point out of a byte iterator (assuming a
/// UTF-8-like encoding).
#[unstable(feature = "str_internals")]
#[inline]
pub fn next_code_point_reverse(bytes: &mut slice::Iter<u8>) -> Option<u32> {
fn next_code_point_reverse(bytes: &mut slice::Iter<u8>) -> Option<u32> {
// Decode UTF-8
let w = match bytes.next_back() {
None => return None,
@ -1873,8 +1872,7 @@ impl AsRef<[u8]> for str {
/// Pluck a code point out of a UTF-8-like byte slice and return the
/// index of the next code point.
#[inline]
#[unstable(feature = "str_internals")]
pub fn char_range_at_raw(bytes: &[u8], i: usize) -> (u32, usize) {
fn char_range_at_raw(bytes: &[u8], i: usize) -> (u32, usize) {
if bytes[i] < 128 {
return (bytes[i] as u32, i + 1);
}

25
src/libstd/sys/common/wtf8.rs
View File

@ -480,31 +480,6 @@ impl Wtf8 {
}
}
/// Returns the code point at `position`.
///
/// # Panics
///
/// Panics if `position` is not at a code point boundary,
/// or is beyond the end of the string.
#[inline]
pub fn code_point_at(&self, position: usize) -> CodePoint {
let (code_point, _) = self.code_point_range_at(position);
code_point
}
/// Returns the code point at `position`
/// and the position of the next code point.
///
/// # Panics
///
/// Panics if `position` is not at a code point boundary,
/// or is beyond the end of the string.
#[inline]
pub fn code_point_range_at(&self, position: usize) -> (CodePoint, usize) {
let (c, n) = char_range_at_raw(&self.bytes, position);
(CodePoint { value: c }, n)
}
/// Returns an iterator for the string’s code points.
#[inline]
pub fn code_points(&self) -> Wtf8CodePoints {