about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2018-11-03 13:40:34 +0100
committerGitHub <noreply@github.com>2018-11-03 13:40:34 +0100
commit8ab8f5342d906b96d1c2e128c39911cdec76ad18 (patch)
tree3b0eb91ae396f84badac279b3a5fcebec17cdf30
parent336b02347f5c42cd330eb2678648e559ff4390f4 (diff)
parente84f461d0abbb499430ab2dd9c81ae90a16f24d1 (diff)
downloadrust-8ab8f5342d906b96d1c2e128c39911cdec76ad18.tar.gz
rust-8ab8f5342d906b96d1c2e128c39911cdec76ad18.zip
Rollup merge of #55555 - aidanhs:aphs-better-z-ls, r=alexcrichton
Make `-Z ls` list the actual filename of external dependencies

The hash is pointless for external consumers - extra_filename is the thing that actually gets used, per https://github.com/rust-lang/rust/blob/ca2639e/src/librustc_metadata/locator.rs#L312-L313
-rw-r--r--src/librustc_metadata/decoder.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs
index 9864c1f3d7c..0854df5d126 100644
--- a/src/librustc_metadata/decoder.rs
+++ b/src/librustc_metadata/decoder.rs
@@ -400,7 +400,7 @@ impl<'a, 'tcx> MetadataBlob {
         for (i, dep) in root.crate_deps
                             .decode(self)
                             .enumerate() {
-            write!(out, "{} {}-{}\n", i + 1, dep.name, dep.hash)?;
+            write!(out, "{} {}{}\n", i + 1, dep.name, dep.extra_filename)?;
         }
         write!(out, "\n")?;
         Ok(())