From 0b2299e889c2dca56b16d0548e1a76cafb7f6a14 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Fri, 21 Mar 2025 16:28:57 -0700 Subject: [PATCH] Remove an excess newline The udpate_message already has a newline when it is there. When it is an empty string, it ends up adding an unnecessary blank line. --- src/cargo/core/compiler/future_incompat.rs | 2 +- tests/testsuite/future_incompat_report.rs | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/cargo/core/compiler/future_incompat.rs b/src/cargo/core/compiler/future_incompat.rs index fe9967e3a..8cc3878fc 100644 --- a/src/cargo/core/compiler/future_incompat.rs +++ b/src/cargo/core/compiler/future_incompat.rs @@ -483,7 +483,7 @@ You may want to consider updating them to a newer version to see if the issue ha " To solve this problem, you can try the following approaches: -{update_message} +{update_message}\ - 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 diff --git a/tests/testsuite/future_incompat_report.rs b/tests/testsuite/future_incompat_report.rs index b1e5f060c..6e6f8c7ca 100644 --- a/tests/testsuite/future_incompat_report.rs +++ b/tests/testsuite/future_incompat_report.rs @@ -149,7 +149,6 @@ fn incompat_in_dependency() { [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 @@ -184,7 +183,6 @@ 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 @@ -634,7 +632,6 @@ fix to the maintainers (e.g. by creating a pull request): 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` "#]].unordered()) @@ -662,7 +659,6 @@ You may want to consider updating them to a newer version to see if the issue ha 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 - - 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 @@ -724,7 +720,6 @@ fn correct_report_id_when_cached() { [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 @@ -752,7 +747,6 @@ https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch [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