Stop using <DefId as Ord> in various diagnostic situations
#122820
Merged
<DefId as Ord> in various diagnostic situations
#122820