language-servers/SpacemanDMM
1
0
Fork 0
mirror of https://github.com/SpaceManiac/SpacemanDMM.git synced 2025-12-23 05:36:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate a couple of minor allocations in dmm-tools CLI

Browse source
This commit is contained in:
Tad Hardesty 2019-12-21 15:41:09 -08:00
parent cd4b6dbaf9
commit 1d65935069
1 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/cli/main.rs
View file

@ -60,15 +60,11 @@ struct Context {
impl Context {
fn objtree(&mut self, opt: &Opt) {
let pathbuf;
let environment: &std::path::Path = match opt.environment {
Some(ref env) => env.as_ref(),
let environment = match opt.environment {
Some(ref env) => env.into(),
None => match dm::detect_environment_default() {
Ok(Some(found)) => {
pathbuf = found;
&pathbuf
}
_ => dm::DEFAULT_ENV.as_ref(),
Ok(Some(found)) => found,
_ => dm::DEFAULT_ENV.into(),
},
};
println!("parsing {}", environment.display());
@ -77,7 +73,7 @@ impl Context {
self.icon_cache.set_icons_root(&parent);
}
let pp = match dm::preprocessor::Preprocessor::new(&self.dm_context, environment.to_owned()) {
let pp = match dm::preprocessor::Preprocessor::new(&self.dm_context, environment) {
Ok(pp) => pp,
Err(e) => {
eprintln!("i/o error opening environment:\n{}", e);
@ -288,14 +284,15 @@ fn run(opt: &Opt, command: &Command, context: &mut Context) {
let errors: RwLock<HashSet<String>> = Default::default();
let perform_job = move |path: &Path| {
let mut filename;
let prefix = if parallel {
let mut filename = path.file_name().unwrap().to_string_lossy().into_owned();
filename = path.file_name().unwrap().to_string_lossy().into_owned();
filename.push_str(": ");
println!("{}{}", filename, path.display());
filename
&filename
} else {
println!("{}", path.display());
" ".to_owned()
" "
};
let map = match dmm::Map::from_file(path) {