OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed Uuid::from_utf8 to Uuid::from_bytes

Browse Source 
This method doesn't deal with utf8. I guess it got caught in a mass
rename.
This commit is contained in:
Steven Fackler 2013-09-07 11:05:48 -07:00
parent 124eb2119c
commit 3eaf750a0d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libextra/uuid.rs
View File

@ -210,7 +210,7 @@ impl Uuid {
/// ///
/// # Arguments /// # Arguments
/// * `b` An array or slice of 16 bytes /// * `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 { if b.len() != 16 {
return None return None
} }
@ -413,7 +413,7 @@ impl Uuid {
ub[i] = FromStrRadix::from_str_radix(vs.slice(i*2, (i+1)*2), 16).unwrap(); 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())
} }
} }
@ -705,11 +705,11 @@ mod test {
} }
#[test] #[test]
fn test_from_utf8() { fn test_from_bytes() {
let b = ~[ 0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, let b = ~[ 0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2,
0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8 ]; 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"; let expected = ~"a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d8";
assert!(u.to_simple_str() == expected); assert!(u.to_simple_str() == expected);
@ -729,7 +729,7 @@ mod test {
let b_in: [u8, ..16] = [ 0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2, let b_in: [u8, ..16] = [ 0xa1, 0xa2, 0xa3, 0xa4, 0xb1, 0xb2, 0xc1, 0xc2,
0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8 ]; 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(); let b_out = u.to_bytes();