Auto merge of #104799 - pcc:linkage-fn, r=tmiasko

author bors <bors@rust-lang.org>

Wed, 7 Dec 2022 10:24:59 +0000 (10:24 +0000)

committer bors <bors@rust-lang.org>

Wed, 7 Dec 2022 10:24:59 +0000 (10:24 +0000)
author bors <bors@rust-lang.org>
Wed, 7 Dec 2022 10:24:59 +0000 (10:24 +0000)
committer bors <bors@rust-lang.org>
Wed, 7 Dec 2022 10:24:59 +0000 (10:24 +0000)
diff --cc compiler/rustc_error_messages/locales/en-US/hir_analysis.ftl
Simple merge
diff --cc compiler/rustc_hir_analysis/src/errors.rs
Simple merge
author	bors <bors@rust-lang.org>
	Wed, 7 Dec 2022 10:24:59 +0000 (10:24 +0000)
committer	bors <bors@rust-lang.org>
	Wed, 7 Dec 2022 10:24:59 +0000 (10:24 +0000)
		1	2
compiler/rustc_error_messages/locales/en-US/hir_analysis.ftl	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/rustc_hir_analysis/src/errors.rs	patch \|	diff1 \|	diff2 \|	blob \| history