From 643b660697832bf11eb5ddb934d19224effd66e9 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 30 Jul 2019 08:55:57 -0700
Subject: [PATCH] Fix excluding target dirs from backups on OSX

This fixes an accidental regression from #6880 identified in #7189 by
moving where the configuration of backup preferences happens since it
was accidentally never happening due to the folder always having been
created.
---
 src/cargo/core/compiler/layout.rs | 71 ++++++++++++++++---------------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/cargo/core/compiler/layout.rs b/src/cargo/core/compiler/layout.rs
index 40140e8ce98..e4ae2bc5174 100644
--- a/src/cargo/core/compiler/layout.rs
+++ b/src/cargo/core/compiler/layout.rs
@@ -109,6 +109,14 @@ impl Layout {
     ///
     /// This function will block if the directory is already locked.
     pub fn at(config: &Config, root: Filesystem) -> CargoResult<Layout> {
+        // If the root directory doesn't already exist go ahead and create it
+        // here. Use this opportunity to exclude it from backups as well if the
+        // system supports it since this is a freshly created folder.
+        if !root.as_path_unlocked().exists() {
+            root.create_dir()?;
+            exclude_from_backups(root.as_path_unlocked());
+        }
+
         // For now we don't do any more finer-grained locking on the artifact
         // directory, so just lock the entire thing for the duration of this
         // compile.
@@ -127,42 +135,8 @@ impl Layout {
         })
     }
 
-    #[cfg(not(target_os = "macos"))]
-    fn exclude_from_backups(&self, _: &Path) {}
-
-    #[cfg(target_os = "macos")]
-    /// Marks files or directories as excluded from Time Machine on macOS
-    ///
-    /// This is recommended to prevent derived/temporary files from bloating backups.
-    fn exclude_from_backups(&self, path: &Path) {
-        use core_foundation::base::TCFType;
-        use core_foundation::{number, string, url};
-        use std::ptr;
-
-        // For compatibility with 10.7 a string is used instead of global kCFURLIsExcludedFromBackupKey
-        let is_excluded_key: Result<string::CFString, _> = "NSURLIsExcludedFromBackupKey".parse();
-        let path = url::CFURL::from_path(path, false);
-        if let (Some(path), Ok(is_excluded_key)) = (path, is_excluded_key) {
-            unsafe {
-                url::CFURLSetResourcePropertyForKey(
-                    path.as_concrete_TypeRef(),
-                    is_excluded_key.as_concrete_TypeRef(),
-                    number::kCFBooleanTrue as *const _,
-                    ptr::null_mut(),
-                );
-            }
-        }
-        // Errors are ignored, since it's an optional feature and failure
-        // doesn't prevent Cargo from working
-    }
-
     /// Makes sure all directories stored in the Layout exist on the filesystem.
     pub fn prepare(&mut self) -> io::Result<()> {
-        if fs::metadata(&self.root).is_err() {
-            fs::create_dir_all(&self.root)?;
-            self.exclude_from_backups(&self.root);
-        }
-
         mkdir(&self.deps)?;
         mkdir(&self.native)?;
         mkdir(&self.incremental)?;
@@ -209,3 +183,32 @@ impl Layout {
         &self.build
     }
 }
+
+#[cfg(not(target_os = "macos"))]
+fn exclude_from_backups(_: &Path) {}
+
+#[cfg(target_os = "macos")]
+/// Marks files or directories as excluded from Time Machine on macOS
+///
+/// This is recommended to prevent derived/temporary files from bloating backups.
+fn exclude_from_backups(path: &Path) {
+    use core_foundation::base::TCFType;
+    use core_foundation::{number, string, url};
+    use std::ptr;
+
+    // For compatibility with 10.7 a string is used instead of global kCFURLIsExcludedFromBackupKey
+    let is_excluded_key: Result<string::CFString, _> = "NSURLIsExcludedFromBackupKey".parse();
+    let path = url::CFURL::from_path(path, false);
+    if let (Some(path), Ok(is_excluded_key)) = (path, is_excluded_key) {
+        unsafe {
+            url::CFURLSetResourcePropertyForKey(
+                path.as_concrete_TypeRef(),
+                is_excluded_key.as_concrete_TypeRef(),
+                number::kCFBooleanTrue as *const _,
+                ptr::null_mut(),
+            );
+        }
+    }
+    // Errors are ignored, since it's an optional feature and failure
+    // doesn't prevent Cargo from working
+}