about summary refs log tree commit diff
diff options
context:
space:
mode:
authorColin Finck <colin.finck@rwth-aachen.de>2018-07-31 09:49:10 +0200
committerColin Finck <colin.finck@rwth-aachen.de>2018-07-31 09:49:10 +0200
commit4ad4ad02ebf6920aee2a15a6b18aadd877b3535f (patch)
treeee539f5123f608e40d1046c855ddd019a3ba0a6d
parente50f4eeaadcea0c1dcc28e15dfe91dd38393a6da (diff)
downloadrust-4ad4ad02ebf6920aee2a15a6b18aadd877b3535f.tar.gz
rust-4ad4ad02ebf6920aee2a15a6b18aadd877b3535f.zip
Fix coding style.
-rw-r--r--src/liballoc_system/lib.rs10
-rw-r--r--src/libstd/sys/unix/condvar.rs5
2 files changed, 12 insertions, 3 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs
index 39768301b9d..8e30b0d5d5a 100644
--- a/src/liballoc_system/lib.rs
+++ b/src/liballoc_system/lib.rs
@@ -174,7 +174,10 @@ mod platform {
         }
     }
 
-    #[cfg(any(target_os = "android", target_os = "hermit", target_os = "redox", target_os = "solaris"))]
+    #[cfg(any(target_os = "android",
+              target_os = "hermit",
+              target_os = "redox",
+              target_os = "solaris"))]
     #[inline]
     unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 {
         // On android we currently target API level 9 which unfortunately
@@ -197,7 +200,10 @@ mod platform {
         libc::memalign(layout.align(), layout.size()) as *mut u8
     }
 
-    #[cfg(not(any(target_os = "android", target_os = "hermit", target_os = "redox", target_os = "solaris")))]
+    #[cfg(not(any(target_os = "android",
+                  target_os = "hermit",
+                  target_os = "redox",
+                  target_os = "solaris")))]
     #[inline]
     unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 {
         let mut out = ptr::null_mut();
diff --git a/src/libstd/sys/unix/condvar.rs b/src/libstd/sys/unix/condvar.rs
index b3ac9e5c140..2007da7b1f6 100644
--- a/src/libstd/sys/unix/condvar.rs
+++ b/src/libstd/sys/unix/condvar.rs
@@ -85,7 +85,10 @@ impl Condvar {
     // where we configure condition variable to use monotonic clock (instead of
     // default system clock). This approach avoids all problems that result
     // from changes made to the system time.
-    #[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "android", target_os = "hermit")))]
+    #[cfg(not(any(target_os = "macos",
+                  target_os = "ios",
+                  target_os = "android",
+                  target_os = "hermit")))]
     pub unsafe fn wait_timeout(&self, mutex: &Mutex, dur: Duration) -> bool {
         use mem;