From de8467cf4203632b91f80523f314bca4ddb17319 Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Fri, 20 Nov 2015 15:00:10 +1300 Subject: [PATCH] save-analysis: make the dump file's name closer to the crate file's name --- src/librustc_trans/save/mod.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/librustc_trans/save/mod.rs b/src/librustc_trans/save/mod.rs index af9f3e4896d..53f2d93c3f1 100644 --- a/src/librustc_trans/save/mod.rs +++ b/src/librustc_trans/save/mod.rs @@ -17,8 +17,9 @@ use std::path::{Path, PathBuf}; use rustc_front; -use rustc::front::map::NodeItem; use rustc_front::{hir, lowering}; +use rustc::front::map::NodeItem; +use rustc::session::config::CrateType::CrateTypeExecutable; use syntax::ast::{self, NodeId}; use syntax::ast_util; @@ -744,7 +745,14 @@ pub fn process_crate<'l, 'tcx>(tcx: &'l ty::ctxt<'tcx>, } // Create output file. - let mut out_name = cratename.to_owned(); + let executable = tcx.sess.crate_types.borrow().iter().any(|ct| *ct == CrateTypeExecutable); + let mut out_name = if executable { + "".to_owned() + } else { + "lib".to_owned() + }; + out_name.push_str(&cratename); + out_name.push_str(&tcx.sess.opts.cg.extra_filename); out_name.push_str(".csv"); root_path.push(&out_name); let output_file = match File::create(&root_path) { -- 2.44.0