fix(future): Report all content as a single Report

epage · epage · commit b190379f55a0 · 2025-09-09T20:43:18.000-05:00
diff --git a/src/cargo/core/compiler/future_incompat.rs b/src/cargo/core/compiler/future_incompat.rs
@@ -505,27 +505,29 @@ https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch
         current_reports.save_report(bcx.ws, suggestion_message.clone(), rendered_report);
 
     if should_display_message || bcx.build_config.future_incompat_report {
-        drop(bcx.gctx.shell().warn(&format!(
+        use annotate_snippets::*;
+        let mut report = vec![Group::with_title(Level::WARNING.secondary_title(format!(
             "the following packages contain code that will be rejected by a future \
              version of Rust: {}",
             package_vers.join(", ")
-        )));
+        )))];
         if bcx.build_config.future_incompat_report {
-            if !suggestion_message.is_empty() {
-                drop(bcx.gctx.shell().note(&suggestion_message));
+            for suggestion in &suggestions {
+                report.push(Group::with_title(Level::HELP.secondary_title(suggestion)));
             }
-            drop(bcx.gctx.shell().note(&format!(
+            report.push(Group::with_title(Level::NOTE.secondary_title(format!(
                 "this report can be shown with `cargo report \
              future-incompatibilities --id {}`",
                 saved_report_id
-            )));
+            ))));
         } else if should_display_message {
-            drop(bcx.gctx.shell().note(&format!(
+            report.push(Group::with_title(Level::NOTE.secondary_title(format!(
                 "to see what the problems were, use the option \
              `--future-incompat-report`, or run `cargo report \
              future-incompatibilities --id {}`",
                 saved_report_id
-            )));
+            ))));
         }
+        drop(bcx.gctx.shell().print_report(&report, false))
     }
 }
diff --git a/tests/testsuite/future_incompat_report.rs b/tests/testsuite/future_incompat_report.rs
@@ -77,6 +77,7 @@ fn incompat_in_local_crate() {
 [WARNING] `foo` (lib) generated 1 warning
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 [WARNING] the following packages contain code that will be rejected by a future version of Rust: foo v0.0.0 ([ROOT]/foo)
+  |
 [NOTE] to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1`
 
 "#]])
@@ -91,6 +92,7 @@ fn incompat_in_local_crate() {
 [WARNING] `foo` (lib) generated 1 warning
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 [WARNING] the following packages contain code that will be rejected by a future version of Rust: foo v0.0.0 ([ROOT]/foo)
+  |
 [NOTE] this report can be shown with `cargo report future-incompatibilities --id 1`
 
 "#]])
@@ -136,6 +138,7 @@ fn incompat_in_dependency() {
 [CHECKING] foo v1.0.0 ([ROOT]/foo)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 [WARNING] the following packages contain code that will be rejected by a future version of Rust: bar v1.0.0
+  |
 [NOTE] to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1`
 
 "#]])
@@ -146,18 +149,15 @@ fn incompat_in_dependency() {
         .with_stderr_data(str![[r#"
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 [WARNING] the following packages contain code that will be rejected by a future version of Rust: bar v1.0.0
-[NOTE] to solve this problem, you can try the following approaches:
-
-- ensure the maintainers know of this problem (e.g. creating a bug report if needed)
-or even helping with a fix (e.g. by creating a pull request)
-  - bar@1.0.0
-  - repository: https://example.com/
-  - detailed warning command: `cargo report future-incompatibilities --id 1 --package bar@1.0.0`
-
-- use your own version of the dependency with the `[patch]` section in `Cargo.toml`
-For more information, see:
-https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
-
+  |
+[HELP] ensure the maintainers know of this problem (e.g. creating a bug report if needed)
+      or even helping with a fix (e.g. by creating a pull request)
+        - bar@1.0.0
+        - repository: https://example.com/
+        - detailed warning command: `cargo report future-incompatibilities --id 1 --package bar@1.0.0`
+[HELP] use your own version of the dependency with the `[patch]` section in `Cargo.toml`
+      For more information, see:
+      https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
 [NOTE] this report can be shown with `cargo report future-incompatibilities --id 1`
 
 "#]])
@@ -362,9 +362,9 @@ fn test_multi_crate() {
 ...
 [WARNING] the following packages contain code that will be rejected by a future version of Rust: first-dep v0.0.1, second-dep v0.0.2
 ...
-  - first-dep@0.0.1
+        - first-dep@0.0.1
 ...
-  - second-dep@0.0.2
+        - second-dep@0.0.2
 ...
 ")
             .run();
@@ -593,30 +593,26 @@ fn suggestions_for_updates() {
 [CHECKING] foo v0.1.0 ([ROOT]/foo)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 [WARNING] the following packages contain code that will be rejected by a future version of Rust: big_update v1.0.0, with_updates v1.0.0, without_updates v1.0.0
-[NOTE] to solve this problem, you can try the following approaches:
-
-- update to a newer version to see if the issue has been fixed
-  - big_update v1.0.0 has the following newer versions available: 2.0.0
-  - with_updates v1.0.0 has the following newer versions available: 1.0.1, 1.0.2, 3.0.1
-
-- ensure the maintainers know of this problem (e.g. creating a bug report if needed)
-or even helping with a fix (e.g. by creating a pull request)
-  - big_update@1.0.0
-  - repository: <not found>
-  - detailed warning command: `cargo report future-incompatibilities --id 1 --package big_update@1.0.0`
-
-  - with_updates@1.0.0
-  - repository: <not found>
-  - detailed warning command: `cargo report future-incompatibilities --id 1 --package with_updates@1.0.0`
-
-  - without_updates@1.0.0
-  - repository: <not found>
-  - detailed warning command: `cargo report future-incompatibilities --id 1 --package without_updates@1.0.0`
-
-- use your own version of the dependency with the `[patch]` section in `Cargo.toml`
-For more information, see:
-https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
-
+  |
+[HELP] update to a newer version to see if the issue has been fixed
+        - big_update v1.0.0 has the following newer versions available: 2.0.0
+        - with_updates v1.0.0 has the following newer versions available: 1.0.1, 1.0.2, 3.0.1
+[HELP] ensure the maintainers know of this problem (e.g. creating a bug report if needed)
+      or even helping with a fix (e.g. by creating a pull request)
+        - big_update@1.0.0
+        - repository: <not found>
+        - detailed warning command: `cargo report future-incompatibilities --id 1 --package big_update@1.0.0`
+      
+        - with_updates@1.0.0
+        - repository: <not found>
+        - detailed warning command: `cargo report future-incompatibilities --id 1 --package with_updates@1.0.0`
+      
+        - without_updates@1.0.0
+        - repository: <not found>
+        - detailed warning command: `cargo report future-incompatibilities --id 1 --package without_updates@1.0.0`
+[HELP] use your own version of the dependency with the `[patch]` section in `Cargo.toml`
+      For more information, see:
+      https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
 [NOTE] this report can be shown with `cargo report future-incompatibilities --id 1`
 
 "#]])
@@ -694,18 +690,15 @@ fn correct_report_id_when_cached() {
 [CHECKING] foo v1.0.0 ([ROOT]/foo)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 [WARNING] the following packages contain code that will be rejected by a future version of Rust: bar v1.0.0
-[NOTE] to solve this problem, you can try the following approaches:
-
-- ensure the maintainers know of this problem (e.g. creating a bug report if needed)
-or even helping with a fix (e.g. by creating a pull request)
-  - bar@1.0.0
-  - repository: https://example.com/
-  - detailed warning command: `cargo report future-incompatibilities --id 1 --package bar@1.0.0`
-
-- use your own version of the dependency with the `[patch]` section in `Cargo.toml`
-For more information, see:
-https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
-
+  |
+[HELP] ensure the maintainers know of this problem (e.g. creating a bug report if needed)
+      or even helping with a fix (e.g. by creating a pull request)
+        - bar@1.0.0
+        - repository: https://example.com/
+        - detailed warning command: `cargo report future-incompatibilities --id 1 --package bar@1.0.0`
+[HELP] use your own version of the dependency with the `[patch]` section in `Cargo.toml`
+      For more information, see:
+      https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
 [NOTE] this report can be shown with `cargo report future-incompatibilities --id 1`
 
 "#]])
@@ -716,18 +709,15 @@ https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch
         .with_stderr_data(str![[r#"
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 [WARNING] the following packages contain code that will be rejected by a future version of Rust: bar v1.0.0
-[NOTE] to solve this problem, you can try the following approaches:
-
-- ensure the maintainers know of this problem (e.g. creating a bug report if needed)
-or even helping with a fix (e.g. by creating a pull request)
-  - bar@1.0.0
-  - repository: https://example.com/
-  - detailed warning command: `cargo report future-incompatibilities --id 1 --package bar@1.0.0`
-
-- use your own version of the dependency with the `[patch]` section in `Cargo.toml`
-For more information, see:
-https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
-
+  |
+[HELP] ensure the maintainers know of this problem (e.g. creating a bug report if needed)
+      or even helping with a fix (e.g. by creating a pull request)
+        - bar@1.0.0
+        - repository: https://example.com/
+        - detailed warning command: `cargo report future-incompatibilities --id 1 --package bar@1.0.0`
+[HELP] use your own version of the dependency with the `[patch]` section in `Cargo.toml`
+      For more information, see:
+      https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
 [NOTE] this report can be shown with `cargo report future-incompatibilities --id 1`
 
 "#]])
