diff options
| author | Martin Nordholts <enselic@gmail.com> | 2023-08-11 06:20:35 +0200 |
|---|---|---|
| committer | Martin Nordholts <enselic@gmail.com> | 2023-09-03 07:14:12 +0200 |
| commit | 04d81ba153d0b7d9ea92fb55e5ef8ebccea226b6 (patch) | |
| tree | 1987f2e394de918fd9f7a28959f8f848e034343f /compiler/rustc_metadata | |
| parent | e286f25ec058276c2c83b809f18eaa7e3db52d99 (diff) | |
| download | rust-04d81ba153d0b7d9ea92fb55e5ef8ebccea226b6.tar.gz rust-04d81ba153d0b7d9ea92fb55e5ef8ebccea226b6.zip | |
Make `.rmeta` file in `dep-info` have correct name (`lib` prefix)
Since `filename_for_metadata()` and `OutputFilenames::path(OutputType::Metadata)` had different logic for the name of the metadata file, the `.d` file contained a file name different from the actual name used. Share the logic to fix the out-of-sync name. Closes 68839.
Diffstat (limited to 'compiler/rustc_metadata')
| -rw-r--r-- | compiler/rustc_metadata/src/fs.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_metadata/src/fs.rs b/compiler/rustc_metadata/src/fs.rs index 69a77e82f98..5ad7425ea1b 100644 --- a/compiler/rustc_metadata/src/fs.rs +++ b/compiler/rustc_metadata/src/fs.rs @@ -5,7 +5,6 @@ use crate::errors::{ use crate::{encode_metadata, EncodedMetadata}; use rustc_data_structures::temp_dir::MaybeTempDir; -use rustc_hir::def_id::LOCAL_CRATE; use rustc_middle::ty::TyCtxt; use rustc_session::config::{OutFileName, OutputType}; use rustc_session::output::filename_for_metadata; @@ -40,8 +39,7 @@ pub fn emit_wrapper_file( } pub fn encode_and_write_metadata(tcx: TyCtxt<'_>) -> (EncodedMetadata, bool) { - let crate_name = tcx.crate_name(LOCAL_CRATE); - let out_filename = filename_for_metadata(tcx.sess, crate_name, tcx.output_filenames(())); + let out_filename = filename_for_metadata(tcx.sess, tcx.output_filenames(())); // To avoid races with another rustc process scanning the output directory, // we need to write the file somewhere else and atomically move it to its // final destination, with an `fs::rename` call. In order for the rename to |
