fix(cli): Adjust messages to match rustc #15928

weihanglo merged 3 commits intorust-lang:masterrust-lang/cargo:masterfrom

epage:annotate-consistentepage/cargo:annotate-consistentCopy head branch name to clipboard