mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline dump_file_basename into dump_path

Browse Source
This commit is contained in:
Zalathar 2024-01-16 18:14:44 +11:00
parent b82d1d32b4
commit 1ec567b99a
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
compiler/rustc_middle/src/mir/pretty.rs
View File

@ -142,15 +142,17 @@ fn dump_matched_mir_node<'tcx, F>(
} }
} }
/// Returns the file basename portion (without extension) of a filename path /// Returns the path to the filename where we should dump a given MIR.
/// where we should dump a MIR representation output files. /// Also used by other bits of code (e.g., NLL inference) that dump
fn dump_file_basename<'tcx>( /// graphviz data or other things.
fn dump_path<'tcx>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
extension: &str,
pass_num: bool, pass_num: bool,
pass_name: &str, pass_name: &str,
disambiguator: &dyn Display, disambiguator: &dyn Display,
body: &Body<'tcx>, body: &Body<'tcx>,
) -> String { ) -> PathBuf {
let source = body.source; let source = body.source;
let promotion_id = match source.promoted { let promotion_id = match source.promoted {
Some(id) => format!("-{id:?}"), Some(id) => format!("-{id:?}"),
@ -186,19 +188,12 @@ fn dump_file_basename<'tcx>(
_ => String::new(), _ => String::new(),
}; };
format!(
"{crate_name}.{item_name}{shim_disambiguator}{promotion_id}{pass_num}.{pass_name}.{disambiguator}",
)
}
/// Returns the path to the filename where we should dump a given MIR.
/// Also used by other bits of code (e.g., NLL inference) that dump
/// graphviz data or other things.
fn dump_path(tcx: TyCtxt<'_>, basename: &str, extension: &str) -> PathBuf {
let mut file_path = PathBuf::new(); let mut file_path = PathBuf::new();
file_path.push(Path::new(&tcx.sess.opts.unstable_opts.dump_mir_dir)); file_path.push(Path::new(&tcx.sess.opts.unstable_opts.dump_mir_dir));
let file_name = format!("{basename}.{extension}",); let file_name = format!(
"{crate_name}.{item_name}{shim_disambiguator}{promotion_id}{pass_num}.{pass_name}.{disambiguator}.{extension}",
);
file_path.push(&file_name); file_path.push(&file_name);
@ -217,11 +212,7 @@ pub fn create_dump_file<'tcx>(
disambiguator: &dyn Display, disambiguator: &dyn Display,
body: &Body<'tcx>, body: &Body<'tcx>,
) -> io::Result<io::BufWriter<fs::File>> { ) -> io::Result<io::BufWriter<fs::File>> {
let file_path = dump_path( let file_path = dump_path(tcx, extension, pass_num, pass_name, disambiguator, body);
tcx,
&dump_file_basename(tcx, pass_num, pass_name, disambiguator, body),
extension,
);
if let Some(parent) = file_path.parent() { if let Some(parent) = file_path.parent() {
fs::create_dir_all(parent).map_err(|e| { fs::create_dir_all(parent).map_err(|e| {
io::Error::new( io::Error::new(