feat(report): support --manifest-path in cargo report timings

src/bin/cargo/commands/report.rs

@@ -30,6 +30,7 @@ pub fn cli() -> Command {
         .subcommand(
             subcommand("timings")
                 .about("Reports the build timings of previous builds (unstable)")
+                .arg_manifest_path()
                 .arg(flag("open", "Opens the timing report in a browser")),
         )
 }
@@ -46,7 +47,8 @@ pub fn exec(gctx: &mut GlobalContext, args: &ArgMatches) -> CliResult {
                 gctx.cli_unstable().build_analysis,
             )?;
             let opts = timings_opts(gctx, args)?;
-            ops::report_timings(gctx, opts)?;
+            let ws = args.workspace(gctx).ok();
+            ops::report_timings(gctx, ws.as_ref(), opts)?;
             Ok(())
         }
         Some((cmd, _)) => {

src/cargo/ops/cargo_report/timings.rs

@@ -28,7 +28,6 @@ use crate::core::compiler::timings::report::compute_concurrency;
 use crate::core::compiler::timings::report::round_to_centisecond;
 use crate::core::compiler::timings::report::write_html;
 use crate::util::BuildLogger;
-use crate::util::important_paths::find_root_manifest_for_wd;
 use crate::util::log_message::FingerprintStatus;
 use crate::util::log_message::LogMessage;
 use crate::util::log_message::Target;
@@ -49,11 +48,12 @@ struct UnitEntry {
     rmeta_time: Option<f64>,
 }
 
-pub fn report_timings(gctx: &GlobalContext, opts: ReportTimingsOptions<'_>) -> CargoResult<()> {
-    let ws = find_root_manifest_for_wd(gctx.cwd())
-        .ok()
-        .and_then(|manifest_path| Workspace::new(&manifest_path, gctx).ok());
-    let Some((log, run_id)) = select_log_file(gctx, ws.as_ref())? else {
+pub fn report_timings(
+    gctx: &GlobalContext,
+    ws: Option<&Workspace<'_>>,
+    opts: ReportTimingsOptions<'_>,
+) -> CargoResult<()> {
+    let Some((log, run_id)) = select_log_file(gctx, ws)? else {
         let title_extra = if let Some(ws) = ws {
             format!(" for workspace at `{}`", ws.root().display())
         } else {

tests/testsuite/cargo_report_timings/mod.rs

@@ -68,7 +68,7 @@ fn no_log_for_the_current_workspace() {
         .file("src/lib.rs", "")
         .build();
 
-    foo.cargo("build -Zbuild-analysis")
+    foo.cargo("check -Zbuild-analysis")
         .env("CARGO_BUILD_ANALYSIS_ENABLED", "true")
         .masquerade_as_nightly_cargo(&["build-analysis"])
         .run();
@@ -101,7 +101,7 @@ fn invalid_log() {
         .file("src/lib.rs", "")
         .build();
 
-    p.cargo("build -Zbuild-analysis")
+    p.cargo("check -Zbuild-analysis")
         .env("CARGO_BUILD_ANALYSIS_ENABLED", "true")
         .masquerade_as_nightly_cargo(&["build-analysis"])
         .run();
@@ -129,7 +129,7 @@ fn empty_log() {
         .file("src/lib.rs", "")
         .build();
 
-    p.cargo("build -Zbuild-analysis")
+    p.cargo("check -Zbuild-analysis")
         .env("CARGO_BUILD_ANALYSIS_ENABLED", "true")
         .masquerade_as_nightly_cargo(&["build-analysis"])
         .run();
@@ -158,7 +158,7 @@ fn prefer_latest() {
         .file("src/lib.rs", "")
         .build();
 
-    p.cargo("build -Zbuild-analysis")
+    p.cargo("check -Zbuild-analysis")
         .env("CARGO_BUILD_ANALYSIS_ENABLED", "true")
         .masquerade_as_nightly_cargo(&["build-analysis"])
         .run();
@@ -167,7 +167,7 @@ fn prefer_latest() {
     std::fs::write(paths::log_file(0), "}|x| hello world").unwrap();
 
     p.change_file("src/lib.rs", "pub fn foo() {}");
-    p.cargo("build -Zbuild-analysis")
+    p.cargo("check -Zbuild-analysis")
         .env("CARGO_BUILD_ANALYSIS_ENABLED", "true")
         .masquerade_as_nightly_cargo(&["build-analysis"])
         .run();
@@ -195,7 +195,7 @@ fn prefer_workspace() {
         .file("src/lib.rs", "")
         .build();
 
-    foo.cargo("build -Zbuild-analysis")
+    foo.cargo("check -Zbuild-analysis")
         .env("CARGO_BUILD_ANALYSIS_ENABLED", "true")
         .masquerade_as_nightly_cargo(&["build-analysis"])
         .run();
@@ -209,7 +209,7 @@ fn prefer_workspace() {
         .file("src/lib.rs", "")
         .build();
 
-    bar.cargo("build -Zbuild-analysis")
+    bar.cargo("check -Zbuild-analysis")
         .env("CARGO_BUILD_ANALYSIS_ENABLED", "true")
         .masquerade_as_nightly_cargo(&["build-analysis"])
         .run();
@@ -236,7 +236,7 @@ fn outside_workspace() {
         .file("src/lib.rs", "")
         .build();
 
-    p.cargo("build -Zbuild-analysis")
+    p.cargo("check -Zbuild-analysis")
         .env("CARGO_BUILD_ANALYSIS_ENABLED", "true")
         .masquerade_as_nightly_cargo(&["build-analysis"])
         .run();
@@ -256,6 +256,39 @@ fn outside_workspace() {
     assert_eq!(p.glob("**/cargo-timing-*.html").count(), 0);
 }
 
+#[cargo_test]
+fn with_manifest_path() {
+    let foo = project()
+        .at("foo")
+        .file("Cargo.toml", &basic_manifest("foo", "0.0.0"))
+        .file("src/lib.rs", "")
+        .build();
+
+    foo.cargo("check -Zbuild-analysis")
+        .env("CARGO_BUILD_ANALYSIS_ENABLED", "true")
+        .masquerade_as_nightly_cargo(&["build-analysis"])
+        .run();
+
+    let bar = project()
+        .at("bar")
+        .file("Cargo.toml", &basic_manifest("bar", "0.0.0"))
+        .file("src/lib.rs", "")
+        .build();
+
+    bar.cargo("check -Zbuild-analysis")
+        .env("CARGO_BUILD_ANALYSIS_ENABLED", "true")
+        .masquerade_as_nightly_cargo(&["build-analysis"])
+        .run();
+
+    foo.cargo("report timings --manifest-path ../bar/Cargo.toml -Zbuild-analysis")
+        .masquerade_as_nightly_cargo(&["build-analysis"])
+        .with_stderr_data(str![[r#"
+      Timing report saved to [ROOT]/bar/target/cargo-timings/cargo-timing-[..]T[..]-[..].html
+
+"#]])
+        .run();
+}
+
 #[cargo_test(nightly, reason = "rustc --json=timings is unstable")]
 fn with_section_timings() {
     let p = project()
@@ -297,7 +330,7 @@ fn with_multiple_targets() {
         .file("tests/t1.rs", "#[test] fn test1() {}")
         .build();
 
-    p.cargo("build --all-targets -Zbuild-analysis")
+    p.cargo("check --all-targets -Zbuild-analysis")
         .env("CARGO_BUILD_ANALYSIS_ENABLED", "true")
         .masquerade_as_nightly_cargo(&["build-analysis"])
         .run();