Auto merge of rust-lang#3131 - RalfJung:rustup, r=RalfJung

Rustup

Also fix josh build (they have a `deny(warnings)` that's causing issues).

Author: bors

clippy_lints/src/utils/internal_lints/metadata_collector.rs

@@ -494,7 +494,7 @@ impl SerializableSpan {
         let loc: Loc = cx.sess().source_map().lookup_char_pos(span.lo());
 
         Self {
-            path: format!("{}", loc.file.name.prefer_remapped()),
+            path: format!("{}", loc.file.name.prefer_remapped_unconditionaly()),
             line: loc.line,
         }
     }