Rollup merge of #101162 - rajputrajat:master, r=davidtwco

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

Fri, 18 Nov 2022 13:13:35 +0000 (14:13 +0100)

committer GitHub <noreply@github.com>

Fri, 18 Nov 2022 13:13:35 +0000 (14:13 +0100)
author Matthias Krüger <matthias.krueger@famsik.de>
Fri, 18 Nov 2022 13:13:35 +0000 (14:13 +0100)
committer GitHub <noreply@github.com>
Fri, 18 Nov 2022 13:13:35 +0000 (14:13 +0100)
diff --cc Cargo.lock
Simple merge
diff --cc compiler/rustc_resolve/src/lib.rs
Simple merge
author	Matthias Krüger <matthias.krueger@famsik.de>
	Fri, 18 Nov 2022 13:13:35 +0000 (14:13 +0100)
committer	GitHub <noreply@github.com>
	Fri, 18 Nov 2022 13:13:35 +0000 (14:13 +0100)
		1	2
Cargo.lock	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/rustc_resolve/src/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history