Rollup merge of #99008 - obeis:issue-98974, r=compiler-errors

author Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com>

Sat, 9 Jul 2022 05:58:06 +0000 (11:28 +0530)

committer GitHub <noreply@github.com>

Sat, 9 Jul 2022 05:58:06 +0000 (11:28 +0530)
author Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com>
Sat, 9 Jul 2022 05:58:06 +0000 (11:28 +0530)
committer GitHub <noreply@github.com>
Sat, 9 Jul 2022 05:58:06 +0000 (11:28 +0530)
diff --cc compiler/rustc_resolve/src/diagnostics.rs
Simple merge
author	Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com>
	Sat, 9 Jul 2022 05:58:06 +0000 (11:28 +0530)
committer	GitHub <noreply@github.com>
	Sat, 9 Jul 2022 05:58:06 +0000 (11:28 +0530)