auto merge of #18840 : huonw/rust/tweaks, r=alexcrichton

Fix some old papercuts with diagnostics, e.g. tweaking spans, rewording messages. See individual commits.

diff --cc src/librustc/metadata/loader.rs
Simple merge

diff --cc src/libsyntax/parse/parser.rs
Simple merge