---

yaml
---
r: 184311
b: refs/heads/master
c: 1386ad4
h: refs/heads/master
i:
  184309: 2fa6b33
  184307: e5e0583
  184303: 6e6a076
v: v3

Author: Dave Huseby

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cd8f31759fd04b9ce9c903fa00cae81dc5bba546
+refs/heads/master: 1386ad489d7dda6a85a52ff042a7d4a47c56e808
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
 refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77

trunk/src/librustdoc/flock.rs

@@ -64,7 +64,7 @@ mod imp {
         pub const F_SETLKW: libc::c_int = 13;
     }
 
-    #[cfg(any(target_os = "dragonfly", 
+    #[cfg(any(target_os = "dragonfly",
               target_os = "bitrig",
               target_os = "openbsd"))]
     mod os {

trunk/src/libstd/rtdeps.rs

@@ -39,7 +39,7 @@ extern {}
 #[link(name = "pthread")]
 extern {}
 
-#[cfg(any(target_os = "dragonfly", 
+#[cfg(any(target_os = "dragonfly",
           target_os = "bitrig",
           target_os = "openbsd"))]
 #[link(name = "pthread")]

trunk/src/libstd/sys/unix/fs.rs

@@ -292,29 +292,29 @@ fn mkstat(stat: &libc::stat) -> FileStat {
     fn mktime(secs: u64, nsecs: u64) -> u64 { secs * 1000 + nsecs / 1000000 }
 
     #[cfg(target_os = "bitrig")]
-    fn ctime(stat: &libc::stat) -> u64 { 
+    fn ctime(stat: &libc::stat) -> u64 {
       mktime(stat.st_ctim.tv_sec as u64, stat.st_ctim.tv_nsec as u64)
     }
     #[cfg(not(target_os = "bitrig"))]
-    fn ctime(stat: &libc::stat) -> u64 { 
+    fn ctime(stat: &libc::stat) -> u64 {
       mktime(stat.st_ctime as u64, stat.st_ctime_nsec as u64) 
     }
 
     #[cfg(target_os = "bitrig")]
-    fn atime(stat: &libc::stat) -> u64 { 
+    fn atime(stat: &libc::stat) -> u64 {
       mktime(stat.st_atim.tv_sec as u64, stat.st_atim.tv_nsec as u64)
     }
     #[cfg(not(target_os = "bitrig"))]
-    fn atime(stat: &libc::stat) -> u64 { 
+    fn atime(stat: &libc::stat) -> u64 {
       mktime(stat.st_atime as u64, stat.st_atime_nsec as u64)
     }
 
     #[cfg(target_os = "bitrig")]
-    fn mtime(stat: &libc::stat) -> u64 { 
+    fn mtime(stat: &libc::stat) -> u64 {
       mktime(stat.st_mtim.tv_sec as u64, stat.st_mtim.tv_nsec as u64)
     }
     #[cfg(not(target_os = "bitrig"))]
-    fn mtime(stat: &libc::stat) -> u64 { 
+    fn mtime(stat: &libc::stat) -> u64 {
       mktime(stat.st_mtime as u64, stat.st_mtime_nsec as u64)
     }
 

trunk/src/libstd/sys/unix/stack_overflow.rs

@@ -206,7 +206,7 @@ mod imp {
 
     }
 
-    #[cfg(any(target_os = "macos", 
+    #[cfg(any(target_os = "macos",
               target_os = "bitrig",
               target_os = "openbsd"))]
     mod signal {

trunk/src/libstd/sys/unix/thread.rs

@@ -74,7 +74,7 @@ pub mod guard {
     static mut PAGE_SIZE: uint = 0;
     static mut GUARD_PAGE: uint = 0;
 
-    #[cfg(any(target_os = "macos", 
+    #[cfg(any(target_os = "macos",
               target_os = "bitrig",
               target_os = "openbsd"))]
     unsafe fn get_stack_start() -> *mut libc::c_void {

trunk/src/libstd/sys/unix/time.rs

@@ -82,7 +82,7 @@ mod inner {
     // Apparently android provides this in some other library?
     // Bitrig's RT extensions are in the C library, not a separate librt
     // OpenBSD provide it via libc
-    #[cfg(not(any(target_os = "android", 
+    #[cfg(not(any(target_os = "android",
                   target_os = "bitrig",
                   target_os = "openbsd")))]
     #[link(name = "rt")]