Skip to content

Commit

Permalink
Rollup merge of rust-lang#55555 - aidanhs:aphs-better-z-ls, r=alexcri…
Browse files Browse the repository at this point in the history
…chton

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
  • Loading branch information
GuillaumeGomez authored Nov 3, 2018
2 parents 336b023 + e84f461 commit 8ab8f53
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc_metadata/decoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(())
Expand Down

0 comments on commit 8ab8f53

Please sign in to comment.