refactor(layout): Moved cargo timings directory to Layout

Author: ranger-ross

src/cargo/core/compiler/build_runner/compilation_files.rs

@@ -282,6 +282,11 @@ impl<'a, 'gctx: 'a> CompilationFiles<'a, 'gctx> {
         self.layout(unit.kind).incremental()
     }
 
+    /// Directory where timing output should go.
+    pub fn timings_dir(&self) -> &Path {
+        self.host.timings()
+    }
+
     /// Returns the path for a file in the fingerprint directory.
     ///
     /// The "prefix" should be something to distinguish the file from other

src/cargo/core/compiler/layout.rs

@@ -132,6 +132,8 @@ pub struct Layout {
     build_examples: PathBuf,
     /// The directory for rustdoc output: `$root/doc`
     doc: PathBuf,
+    /// The directory for --timings output
+    timings: PathBuf,
     /// The directory for temporary data of integration tests and benches: `$dest/tmp`
     tmp: PathBuf,
     /// The lockfile for a build (`.cargo-lock`). Will be unlocked when this
@@ -209,6 +211,7 @@ impl Layout {
             examples: dest.join("examples"),
             build_examples: build_dest.join("examples"),
             doc: root.join("doc"),
+            timings: root.join("cargo-timings"),
             tmp: build_root.join("tmp"),
             root,
             dest,
@@ -268,6 +271,10 @@ impl Layout {
     pub fn incremental(&self) -> &Path {
         &self.incremental
     }
+    /// Fetch the timings path.
+    pub fn timings(&self) -> &Path {
+        &self.timings
+    }
     /// Fetch the fingerprint path.
     pub fn fingerprint(&self, pkg_dir: &str) -> PathBuf {
         if self.is_new_layout {

src/cargo/core/compiler/timings.rs

@@ -441,7 +441,7 @@ impl<'gctx> Timings<'gctx> {
     ) -> CargoResult<()> {
         let duration = self.start.elapsed().as_secs_f64();
         let timestamp = self.start_str.replace(&['-', ':'][..], "");
-        let timings_path = build_runner.files().host_root().join("cargo-timings");
+        let timings_path = build_runner.files().timings_dir();
         paths::create_dir_all(&timings_path)?;
         let filename = timings_path.join(format!("cargo-timing-{}.html", timestamp));
         let mut f = BufWriter::new(paths::create(&filename)?);