rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove duplicate function from std::ptr (is_null, is_not_null, offset, mut_offset)

Browse Source
This commit is contained in:
JeremyLetang
2014-02-10 16:50:42 -05:00
committed by Alex Crichton
parent 1c5295c0bf
commit 60bc76fb78
14 changed files with 70 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libstd/str.rs
View File

@@ -1242,7 +1242,7 @@ pub mod raw {
let mut i = 0;
while *curr != 0 {
i += 1;
curr = ptr::offset(buf, i);
curr = buf.offset(i);
}
from_buf_len(buf as *u8, i as uint)
}
@@ -1272,7 +1272,7 @@ pub mod raw {
let mut len = 0u;
while *curr != 0u8 {
len += 1u;
curr = ptr::offset(s, len as int);
curr = s.offset(len as int);
}
let v = Slice { data: s, len: len };
assert!(is_utf8(::cast::transmute(v)));
@@ -2921,7 +2921,6 @@ impl Default for ~str {
mod tests {
use iter::AdditiveIterator;
use prelude::*;
use ptr;
use str::*;
#[test]
@@ -3549,11 +3548,11 @@ mod tests {
fn test_as_ptr() {
let buf = "hello".as_ptr();
unsafe {
assert_eq!(*ptr::offset(buf, 0), 'h' as u8);
assert_eq!(*ptr::offset(buf, 1), 'e' as u8);
assert_eq!(*ptr::offset(buf, 2), 'l' as u8);
assert_eq!(*ptr::offset(buf, 3), 'l' as u8);
assert_eq!(*ptr::offset(buf, 4), 'o' as u8);
assert_eq!(*buf.offset(0), 'h' as u8);
assert_eq!(*buf.offset(1), 'e' as u8);
assert_eq!(*buf.offset(2), 'l' as u8);
assert_eq!(*buf.offset(3), 'l' as u8);
assert_eq!(*buf.offset(4), 'o' as u8);
}
}