Skip to content

Str from bytes API cleanup, attempt 2 #7172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Str from bytes API cleanup, attempt 2 #7172

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad799f2
std: allow vec::bytes::memcmp to work on slices
erickt Jun 8, 2013
1f4eddb
std: group the option tests inside a module
erickt Jun 8, 2013
48312a5
minor cleanup
erickt Jun 12, 2013
5795bb1
std: rename str::from_bytes{,_with_null,_slice} to from_utf8*
erickt Jun 15, 2013
73b7604
std: add str::from_utf8_slice{,with_null}
erickt Jun 15, 2013
486509b
std: change std::{from_bytes,from_bytes_with_null} to consume vec
erickt Jun 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
std: allow vec::bytes::memcmp to work on slices
  • Loading branch information
@erickt
erickt committed Jun 19, 2013
commit ad799f200cec632dc57edb0bd39e35c7f69204c0
18 changes: 9 additions & 9 deletions src/libstd/vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2413,13 +2413,13 @@ pub mod bytes {
use vec;

/// Bytewise string comparison
pub fn memcmp(a: &~[u8], b: &~[u8]) -> int {
pub fn memcmp(a: &[u8], b: &[u8]) -> int {
let a_len = a.len();
let b_len = b.len();
let n = uint::min(a_len, b_len) as libc::size_t;
let r = unsafe {
libc::memcmp(raw::to_ptr(*a) as *libc::c_void,
raw::to_ptr(*b) as *libc::c_void, n) as int
libc::memcmp(raw::to_ptr(a) as *libc::c_void,
raw::to_ptr(b) as *libc::c_void, n) as int
};

if r != 0 { r } else {
Expand All @@ -2434,22 +2434,22 @@ pub mod bytes {
}

/// Bytewise less than or equal
pub fn lt(a: &~[u8], b: &~[u8]) -> bool { memcmp(a, b) < 0 }
pub fn lt(a: &[u8], b: &[u8]) -> bool { memcmp(a, b) < 0 }

/// Bytewise less than or equal
pub fn le(a: &~[u8], b: &~[u8]) -> bool { memcmp(a, b) <= 0 }
pub fn le(a: &[u8], b: &[u8]) -> bool { memcmp(a, b) <= 0 }

/// Bytewise equality
pub fn eq(a: &~[u8], b: &~[u8]) -> bool { memcmp(a, b) == 0 }
pub fn eq(a: &[u8], b: &[u8]) -> bool { memcmp(a, b) == 0 }

/// Bytewise inequality
pub fn ne(a: &~[u8], b: &~[u8]) -> bool { memcmp(a, b) != 0 }
pub fn ne(a: &[u8], b: &[u8]) -> bool { memcmp(a, b) != 0 }

/// Bytewise greater than or equal
pub fn ge(a: &~[u8], b: &~[u8]) -> bool { memcmp(a, b) >= 0 }
pub fn ge(a: &[u8], b: &[u8]) -> bool { memcmp(a, b) >= 0 }

/// Bytewise greater than
pub fn gt(a: &~[u8], b: &~[u8]) -> bool { memcmp(a, b) > 0 }
pub fn gt(a: &[u8], b: &[u8]) -> bool { memcmp(a, b) > 0 }

/**
* Copies data from one vector to another.
Expand Down