---

yaml
---
r: 79550
b: refs/heads/master
c: 3eaf750
h: refs/heads/master
v: v3

Author: sfackler

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 75afcffc2ffdbac1d0a837d8407ae5720dce9631
+refs/heads/master: 3eaf750a0de8acd5662d725b651e366fb703e5fa
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eae327032c775813eeb101233a4f7df24eab0a6a
 refs/heads/try: ac820906c0e53eab79a98ee64f7231f57c3887b4

trunk/mk/rt.mk

@@ -178,7 +178,7 @@ export PYTHONPATH := $(PYTHONPATH):$$(S)src/gyp/pylib
 
 $$(LIBUV_MAKEFILE_$(1)_$(2)):
 	(cd $(S)src/libuv/ && \
-	 $$(CFG_PYTHON) ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \
+	 ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \
 	   -Goutput_dir=$$(@D) --generator-output $$(@D))
 
 # XXX: Shouldn't need platform-specific conditions here

trunk/src/libextra/uuid.rs

@@ -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
         }
@@ -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())
     }
 }
 
@@ -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);
@@ -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();