Merge commit 'efce0caf2d75dff5a83812b8da2dd3725197ac7c' into HEAD

author Thomas Schwinge <thomas@codesourcery.com>

Sun, 12 Feb 2023 15:34:59 +0000 (16:34 +0100)

committer Thomas Schwinge <thomas@codesourcery.com>

Sun, 12 Feb 2023 15:34:59 +0000 (16:34 +0100)
author Thomas Schwinge <thomas@codesourcery.com>
Sun, 12 Feb 2023 15:34:59 +0000 (16:34 +0100)
committer Thomas Schwinge <thomas@codesourcery.com>
Sun, 12 Feb 2023 15:34:59 +0000 (16:34 +0100)
diff --cc gcc/rust/resolve/rust-ast-resolve-item.cc
Simple merge
author	Thomas Schwinge <thomas@codesourcery.com>
	Sun, 12 Feb 2023 15:34:59 +0000 (16:34 +0100)
committer	Thomas Schwinge <thomas@codesourcery.com>
	Sun, 12 Feb 2023 15:34:59 +0000 (16:34 +0100)