Skip to content

Commit 7719031

Browse files
committed
fix(future): Remove gap between item and its children
1 parent 4c0e5d1 commit 7719031

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

src/cargo/core/compiler/future_incompat.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,7 @@ pub fn save_and_display_report(
434434
let update_message = if !updated_versions.is_empty() {
435435
format!(
436436
"\
437-
update to a newer version to see if the issue has been fixed
438-
{updated_versions}",
437+
update to a newer version to see if the issue has been fixed{updated_versions}",
439438
updated_versions = updated_versions
440439
)
441440
} else {
@@ -476,7 +475,6 @@ update to a newer version to see if the issue has been fixed
476475
"\
477476
ensure the maintainers know of this problem (e.g. creating a bug report if needed)
478477
or even helping with a fix (e.g. by creating a pull request)
479-
480478
{upstream_info}"
481479
));
482480
suggestions.push(

tests/testsuite/future_incompat_report.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ fn incompat_in_dependency() {
150150
151151
- ensure the maintainers know of this problem (e.g. creating a bug report if needed)
152152
or even helping with a fix (e.g. by creating a pull request)
153-
154153
155154
- repository: https://example.com/
156155
- detailed warning command: `cargo report future-incompatibilities --id 1 --package [email protected]`
@@ -180,7 +179,6 @@ to solve this problem, you can try the following approaches:
180179
181180
- ensure the maintainers know of this problem (e.g. creating a bug report if needed)
182181
or even helping with a fix (e.g. by creating a pull request)
183-
184182
185183
- repository: https://example.com/
186184
- detailed warning command: `cargo report future-incompatibilities --id 1 --package [email protected]`
@@ -598,13 +596,11 @@ fn suggestions_for_updates() {
598596
[NOTE] to solve this problem, you can try the following approaches:
599597
600598
- update to a newer version to see if the issue has been fixed
601-
602599
- big_update v1.0.0 has the following newer versions available: 2.0.0
603600
- with_updates v1.0.0 has the following newer versions available: 1.0.1, 1.0.2, 3.0.1
604601
605602
- ensure the maintainers know of this problem (e.g. creating a bug report if needed)
606603
or even helping with a fix (e.g. by creating a pull request)
607-
608604
609605
- repository: <not found>
610606
- detailed warning command: `cargo report future-incompatibilities --id 1 --package [email protected]`
@@ -641,13 +637,11 @@ means and how to resolve it.
641637
to solve this problem, you can try the following approaches:
642638
643639
- update to a newer version to see if the issue has been fixed
644-
645640
- big_update v1.0.0 has the following newer versions available: 2.0.0
646641
- with_updates v1.0.0 has the following newer versions available: 1.0.1, 1.0.2, 3.0.1
647642
648643
- ensure the maintainers know of this problem (e.g. creating a bug report if needed)
649644
or even helping with a fix (e.g. by creating a pull request)
650-
651645
652646
- repository: <not found>
653647
- detailed warning command: `cargo report future-incompatibilities --id 1 --package [email protected]`
@@ -704,7 +698,6 @@ fn correct_report_id_when_cached() {
704698
705699
- ensure the maintainers know of this problem (e.g. creating a bug report if needed)
706700
or even helping with a fix (e.g. by creating a pull request)
707-
708701
709702
- repository: https://example.com/
710703
- detailed warning command: `cargo report future-incompatibilities --id 1 --package [email protected]`
@@ -727,7 +720,6 @@ https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch
727720
728721
- ensure the maintainers know of this problem (e.g. creating a bug report if needed)
729722
or even helping with a fix (e.g. by creating a pull request)
730-
731723
732724
- repository: https://example.com/
733725
- detailed warning command: `cargo report future-incompatibilities --id 1 --package [email protected]`

0 commit comments

Comments
 (0)