Don't show a suggestion to update dependencies

This removes the suggestion to update dependencies when the future
incompat error comes from the local crate. It doesn't make sense to
suggest that.

Author: ehuss

src/cargo/core/compiler/future_incompat.rs

@@ -70,6 +70,8 @@ pub struct FutureIncompatReport {
 /// Structure used for collecting reports in-memory.
 pub struct FutureIncompatReportPackage {
     pub package_id: PackageId,
+    /// Whether or not this is a local package, or a remote dependency.
+    pub is_local: bool,
     pub items: Vec<FutureBreakageItem>,
 }
 
@@ -470,8 +472,15 @@ You may want to consider updating them to a newer version to see if the issue ha
         .collect::<Vec<_>>()
         .join("\n");
 
-    let suggestion_message = format!(
-        "
+    let all_is_local = per_package_future_incompat_reports
+        .iter()
+        .all(|report| report.is_local);
+
+    let suggestion_message = if all_is_local {
+        String::new()
+    } else {
+        format!(
+            "
 To solve this problem, you can try the following approaches:
 
 {update_message}
@@ -486,15 +495,18 @@ section in `Cargo.toml` to use your own version of the dependency. For more
 information, see:
 https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
 ",
-        upstream_info = upstream_info,
-        update_message = update_message,
-    );
+            upstream_info = upstream_info,
+            update_message = update_message,
+        )
+    };
 
     let saved_report_id =
         current_reports.save_report(bcx.ws, suggestion_message.clone(), rendered_report);
 
     if bcx.build_config.future_incompat_report {
-        drop(bcx.gctx.shell().note(&suggestion_message));
+        if !suggestion_message.is_empty() {
+            drop(bcx.gctx.shell().note(&suggestion_message));
+        }
         drop(bcx.gctx.shell().note(&format!(
             "this report can be shown with `cargo report \
              future-incompatibilities --id {}`",

src/cargo/core/compiler/job_queue/mod.rs

@@ -700,9 +700,15 @@ impl<'gctx> DrainState<'gctx> {
                 }
             }
             Message::FutureIncompatReport(id, items) => {
-                let package_id = self.active[&id].pkg.package_id();
+                let unit = &self.active[&id];
+                let package_id = unit.pkg.package_id();
+                let is_local = unit.is_local();
                 self.per_package_future_incompat_reports
-                    .push(FutureIncompatReportPackage { package_id, items });
+                    .push(FutureIncompatReportPackage {
+                        package_id,
+                        is_local,
+                        items,
+                    });
             }
             Message::Token(acquired_token) => {
                 let token = acquired_token.context("failed to acquire jobserver token")?;

tests/testsuite/future_incompat_report.rs

@@ -91,24 +91,6 @@ 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 solve this problem, you can try the following approaches:
-
-
-- If the issue is not solved by updating the dependencies, a fix has to be
-implemented by those dependencies. You can help with that by notifying the
-maintainers of this problem (e.g. by creating a bug report) or by proposing a
-fix to the maintainers (e.g. by creating a pull request):
-
-  - foo@0.0.0
-  - Repository: <not found>
-  - Detailed warning command: `cargo report future-incompatibilities --id 1 --package foo@0.0.0`
-
-- If waiting for an upstream fix is not an option, you can use the `[patch]`
-section in `Cargo.toml` to use your own version of the dependency. 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`
 
 "#]])
@@ -127,23 +109,6 @@ Each warning should contain a link for more information on what the warning
 means and how to resolve it.
 
 
-To solve this problem, you can try the following approaches:
-
-
-- If the issue is not solved by updating the dependencies, a fix has to be
-implemented by those dependencies. You can help with that by notifying the
-maintainers of this problem (e.g. by creating a bug report) or by proposing a
-fix to the maintainers (e.g. by creating a pull request):
-
-  - foo@0.0.0
-  - Repository: <not found>
-  - Detailed warning command: `cargo report future-incompatibilities --id 1 --package foo@0.0.0`
-
-- If waiting for an upstream fix is not an option, you can use the `[patch]`
-section in `Cargo.toml` to use your own version of the dependency. For more
-information, see:
-https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section
-
 The package `foo v0.0.0 ([ROOT]/foo)` currently triggers the following future incompatibility lints:
 > [WARNING] unused variable: `x`
 ...
@@ -352,7 +317,7 @@ frequency = 'never'
 ...
 [WARNING] the following packages contain code that will be rejected by a future version of Rust: foo v0.0.0 ([ROOT]/foo)
 ...
-  - foo@0.0.0
+[NOTE] this report can be shown with `cargo report future-incompatibilities --id [..]`
 ...
 ")
             .run();