nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store filestem in a pre-formatted form

Browse Source
This commit is contained in:
Mark Rousskov 2020-01-21 09:54:58 -05:00 committed by Shotaro Yamada
parent d1bb7e16e0
commit 8c6067c24e
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/librustc_session/config.rs
View File

@ -447,9 +447,8 @@ impl Input {
#[derive(Clone, Hash)] #[derive(Clone, Hash)]
pub struct OutputFilenames { pub struct OutputFilenames {
pub out_directory: PathBuf, pub out_directory: PathBuf,
out_filestem: String, filestem: String,
pub single_output_file: Option<PathBuf>, pub single_output_file: Option<PathBuf>,
extra: String,
pub outputs: OutputTypes, pub outputs: OutputTypes,
} }
@ -465,7 +464,12 @@ impl OutputFilenames {
extra: String, extra: String,
outputs: OutputTypes, outputs: OutputTypes,
) -> Self { ) -> Self {
OutputFilenames { out_directory, out_filestem, single_output_file, extra, outputs } OutputFilenames {
out_directory,
single_output_file,
outputs,
filestem: format!("{}{}", out_filestem, extra),
}
} }
pub fn path(&self, flavor: OutputType) -> PathBuf { pub fn path(&self, flavor: OutputType) -> PathBuf {
@ -487,7 +491,7 @@ impl OutputFilenames {
/// Like temp_path, but also supports things where there is no corresponding /// Like temp_path, but also supports things where there is no corresponding
/// OutputType, like noopt-bitcode or lto-bitcode. /// OutputType, like noopt-bitcode or lto-bitcode.
pub fn temp_path_ext(&self, ext: &str, codegen_unit_name: Option<&str>) -> PathBuf { pub fn temp_path_ext(&self, ext: &str, codegen_unit_name: Option<&str>) -> PathBuf {
let base = self.out_directory.join(&self.filestem()); let base = self.out_directory.join(&self.filestem);
let mut extension = String::new(); let mut extension = String::new();
@ -505,16 +509,11 @@ impl OutputFilenames {
extension.push_str(ext); extension.push_str(ext);
} }
let path = base.with_extension(&extension[..]); base.with_extension(extension)
path
} }
pub fn with_extension(&self, extension: &str) -> PathBuf { pub fn with_extension(&self, extension: &str) -> PathBuf {
self.out_directory.join(&self.filestem()).with_extension(extension) self.out_directory.join(&self.filestem).with_extension(extension)
}
pub fn filestem(&self) -> String {
format!("{}{}", self.out_filestem, self.extra)
} }
} }