Skip to content
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

Jump to bottom

Renamed Uuid::from_utf8 to Uuid::from_bytes #9043

Closed
wants to merge 1 commit into from
Closed

Renamed Uuid::from_utf8 to Uuid::from_bytes #9043

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/libextra/uuid.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ impl Uuid {
///
/// # Arguments
/// * `b` An array or slice of 16 bytes
pub fn from_utf8(b: &[u8]) -> Option<Uuid> {
pub fn from_bytes(b: &[u8]) -> Option<Uuid> {
if b.len() != 16 {
return None
}
Expand Down Expand Up @@ -413,7 +413,7 @@ impl Uuid {
ub[i] = FromStrRadix::from_str_radix(vs.slice(i*2, (i+1)*2), 16).unwrap();
}

Ok(Uuid::from_utf8(ub).unwrap())
Ok(Uuid::from_bytes(ub).unwrap())
}
}

Expand Down Expand Up @@ -705,11 +705,11 @@ mod test {
}

#[test]
fn test_from_utf8() {
fn test_from_bytes() {
let b = ~[ 0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2,
0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8 ];

let u = Uuid::from_utf8(b).unwrap();
let u = Uuid::from_bytes(b).unwrap();
let expected = ~"a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";

assert!(u.to_simple_str() == expected);
Expand All @@ -729,7 +729,7 @@ mod test {
let b_in: [u8, ..16] = [ 0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2,
0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8 ];

let u = Uuid::from_utf8(b_in.clone()).unwrap();
let u = Uuid::from_bytes(b_in.clone()).unwrap();

let b_out = u.to_bytes();

Expand Down