Add the ability to merge spans to codemap#36585

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

sophiajt:misc_error_touchupssophiajt/rust:misc_error_touchupsCopy head branch name to clipboard