Rollup merge of #106897 - estebank:issue-99430, r=davidtwco

author Matthias Krüger <matthias.krueger@famsik.de>

Wed, 25 Jan 2023 21:19:52 +0000 (22:19 +0100)

committer GitHub <noreply@github.com>

Wed, 25 Jan 2023 21:19:52 +0000 (22:19 +0100)
author Matthias Krüger <matthias.krueger@famsik.de>
Wed, 25 Jan 2023 21:19:52 +0000 (22:19 +0100)
committer GitHub <noreply@github.com>
Wed, 25 Jan 2023 21:19:52 +0000 (22:19 +0100)
diff --cc compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
Simple merge
diff --cc compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
Simple merge
author	Matthias Krüger <matthias.krueger@famsik.de>
	Wed, 25 Jan 2023 21:19:52 +0000 (22:19 +0100)
committer	GitHub <noreply@github.com>
	Wed, 25 Jan 2023 21:19:52 +0000 (22:19 +0100)
		1	2
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history