Resolve: improve diagnostics for duplicate definitions and imports#32284

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

jseyfried:name_conflict_diagnosticsjseyfried/rust:name_conflict_diagnosticsCopy head branch name to clipboard