---

yaml
---
r: 177591
b: refs/heads/auto
c: c155208
h: refs/heads/master
i:
  177589: 114b2cf
  177587: 049546b
  177583: 9287360
v: v3

Author: vojtechkral

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: ec4981ece86769c768d61a914093a7a39192522c
+refs/heads/auto: c155208de42de5761231726e35614b4499b5a137
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/sys/unix/thread.rs

@@ -223,9 +223,9 @@ pub unsafe fn set_name(name: &str) {
     pthread_set_name_np(pthread_self(), cname.as_ptr());
 }
 
-#[cfg(target_os = "macos")]
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 pub unsafe fn set_name(name: &str) {
-    // pthread_setname_np() since OS X 10.6
+    // pthread_setname_np() since OS X 10.6 and iOS 3.2
     let cname = CString::from_slice(name.as_bytes());
     pthread_setname_np(cname.as_ptr());
 }

branches/auto/src/libstd/sys/windows/thread.rs

@@ -67,10 +67,10 @@ pub unsafe fn create(stack: uint, p: Thunk) -> rust_thread {
     return ret;
 }
 
-pub unsafe fn set_name(name: &str) {
+pub unsafe fn set_name(_name: &str) {
     // Windows threads are nameless
     // The names in MSVC debugger are obtained using a "magic" exception,
-    // which requires a use of C++ macros.
+    // which requires a use of MS C++ extensions.
     // See https://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx
 }