]> git.lizzy.rs Git - rust.git/commitdiff
remove some extra }
authorCameron Taggart <cameron.taggart@gmail.com>
Wed, 22 Apr 2020 15:18:54 +0000 (09:18 -0600)
committerCameron Taggart <cameron.taggart@gmail.com>
Wed, 22 Apr 2020 15:18:54 +0000 (09:18 -0600)
src/librustc_data_structures/profiling.rs

index e2a1ba3a24b105de81f17df4523246cbd6f33bbd..07d16c6483ec797cbec35e747dda60f9d277c343 100644 (file)
@@ -607,39 +607,37 @@ pub fn duration_to_secs_str(dur: std::time::Duration) -> String {
 }
 
 // Memory reporting
-    cfg_if! {
-        if #[cfg(windows)] {
-            fn get_resident() -> Option<usize> {
-                use std::mem::{self, MaybeUninit};
-                use winapi::shared::minwindef::DWORD;
-                use winapi::um::processthreadsapi::GetCurrentProcess;
-                use winapi::um::psapi::{GetProcessMemoryInfo, PROCESS_MEMORY_COUNTERS};
-
-                let mut pmc = MaybeUninit::<PROCESS_MEMORY_COUNTERS>::uninit();
-                match unsafe {
-                    GetProcessMemoryInfo(GetCurrentProcess(), pmc.as_mut_ptr(), mem::size_of_val(&pmc) as DWORD)
-                } {
-                    0 => None,
-                    _ => {
-                        let pmc = unsafe { pmc.assume_init() };
-                        Some(pmc.WorkingSetSize as usize)
-                    }
+cfg_if! {
+    if #[cfg(windows)] {
+        fn get_resident() -> Option<usize> {
+            use std::mem::{self, MaybeUninit};
+            use winapi::shared::minwindef::DWORD;
+            use winapi::um::processthreadsapi::GetCurrentProcess;
+            use winapi::um::psapi::{GetProcessMemoryInfo, PROCESS_MEMORY_COUNTERS};
+
+            let mut pmc = MaybeUninit::<PROCESS_MEMORY_COUNTERS>::uninit();
+            match unsafe {
+                GetProcessMemoryInfo(GetCurrentProcess(), pmc.as_mut_ptr(), mem::size_of_val(&pmc) as DWORD)
+            } {
+                0 => None,
+                _ => {
+                    let pmc = unsafe { pmc.assume_init() };
+                    Some(pmc.WorkingSetSize as usize)
                 }
             }
-        } else if #[cfg(unix)] {
-            fn get_resident() -> Option<usize> {
-                let field = 1;
-                let contents = fs::read("/proc/self/statm").ok()?;
-                let contents = String::from_utf8(contents).ok()?;
-                let s = contents.split_whitespace().nth(field)?;
-                let npages = s.parse::<usize>().ok()?;
-                Some(npages * 4096)
-            }
-        } else {
-            fn get_resident() -> Option<usize> {
-                None
-            }
         }
+    } else if #[cfg(unix)] {
+        fn get_resident() -> Option<usize> {
+            let field = 1;
+            let contents = fs::read("/proc/self/statm").ok()?;
+            let contents = String::from_utf8(contents).ok()?;
+            let s = contents.split_whitespace().nth(field)?;
+            let npages = s.parse::<usize>().ok()?;
+            Some(npages * 4096)
+        }
+    } else {
+        fn get_resident() -> Option<usize> {
+            None
         }
     }
 }