Auto merge of #126804 - estebank:short-error-primary-label, r=davidtwco

On short error format, append primary span label to message

The `error-format=short` output only displays the path, error code and main error message all in the same line. We now add the primary span label as well after the error message, to provide more context.