Merge pull request #1014 from creusot-rs/fix-metadata-paths

Fix metadata load path

creusot/src/metadata.rs

@@ -6,6 +6,7 @@ use indexmap::IndexMap;
 use rustc_hir::def_id::{CrateNum, DefId};
 use rustc_macros::{TyDecodable, TyEncodable};
 use rustc_middle::ty::TyCtxt;
+use rustc_session::config::OutputType;
 use rustc_span::Symbol;
 use std::{
     collections::HashMap,
@@ -140,12 +141,11 @@ impl<'tcx> BinaryMetadata<'tcx> {
 
 fn export_file(ctx: &TranslationCtx, out: &Option<String>) -> PathBuf {
     out.as_ref().map(|s| s.clone().into()).unwrap_or_else(|| {
-        let outputs = ctx.tcx.output_filenames(());
-
-        // let crate_name = ctx.tcx.crate_name(LOCAL_CRATE);
-
-        outputs.with_extension("cmeta")
-        // .join(&format!("lib{}.cmeta", libname))
+        let outputs = ctx.output_filenames(());
+        let out = outputs.path(OutputType::Metadata);
+        let path = out.as_path().to_owned();
+        let path = path.with_extension("cmeta");
+        path
     })
 }