holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up nu-cli/src/eval_file.rs (#7804)

Browse Source 
- Replace `match` with `unwrap_or_else` or `if let`
- Remove unnecessary `mut`
- Check if file path has a parent
- Reduce visibility to `pub(crate)`
This commit is contained in:
Hofer-Julian 2023-01-20 22:45:34 +01:00 committed by GitHub
parent 9e4a2ab824
commit a775cfe177
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 63 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
crates/nu-cli/src/eval_file.rs
View File

@ -29,44 +29,36 @@ pub fn evaluate_file(
let cwd = current_dir(engine_state, stack)?; let cwd = current_dir(engine_state, stack)?;
let file_path = { let file_path = canonicalize_with(&path, &cwd).unwrap_or_else(|e| {
match canonicalize_with(&path, &cwd) { let working_set = StateWorkingSet::new(engine_state);
Ok(p) => p, report_error(
Err(e) => { &working_set,
let working_set = StateWorkingSet::new(engine_state); &ShellError::FileNotFoundCustom(
report_error( format!("Could not access file '{}': {:?}", path, e.to_string()),
&working_set, Span::unknown(),
&ShellError::FileNotFoundCustom( ),
format!("Could not access file '{}': {:?}", path, e.to_string()), );
Span::unknown(), std::process::exit(1);
), });
);
std::process::exit(1);
}
}
};
let file_path_str = match file_path.to_str() { let file_path_str = file_path.to_str().unwrap_or_else(|| {
Some(s) => s, let working_set = StateWorkingSet::new(engine_state);
None => { report_error(
let working_set = StateWorkingSet::new(engine_state); &working_set,
report_error( &ShellError::NonUtf8Custom(
&working_set, format!(
&ShellError::NonUtf8Custom( "Input file name '{}' is not valid UTF8",
format!( file_path.to_string_lossy()
"Input file name '{}' is not valid UTF8",
file_path.to_string_lossy()
),
Span::unknown(),
), ),
); Span::unknown(),
std::process::exit(1); ),
} );
}; std::process::exit(1);
});
let file = match std::fs::read(&file_path).into_diagnostic() { let file = std::fs::read(&file_path)
Ok(p) => p, .into_diagnostic()
Err(e) => { .unwrap_or_else(|e| {
let working_set = StateWorkingSet::new(engine_state); let working_set = StateWorkingSet::new(engine_state);
report_error( report_error(
&working_set, &working_set,
@ -80,13 +72,21 @@ pub fn evaluate_file(
), ),
); );
std::process::exit(1); std::process::exit(1);
} });
};
engine_state.start_in_file(Some(file_path_str)); engine_state.start_in_file(Some(file_path_str));
let mut parent = file_path.clone(); let parent = file_path.parent().unwrap_or_else(|| {
parent.pop(); let working_set = StateWorkingSet::new(engine_state);
report_error(
&working_set,
&ShellError::FileNotFoundCustom(
format!("The file path '{}' does not have a parent", file_path_str),
Span::unknown(),
),
);
std::process::exit(1);
});
stack.add_env_var( stack.add_env_var(
"FILE_PWD".to_string(), "FILE_PWD".to_string(),
@ -121,7 +121,7 @@ pub fn evaluate_file(
Ok(()) Ok(())
} }
pub fn print_table_or_error( pub(crate) fn print_table_or_error(
engine_state: &mut EngineState, engine_state: &mut EngineState,
stack: &mut Stack, stack: &mut Stack,
mut pipeline_data: PipelineData, mut pipeline_data: PipelineData,
@ -137,43 +137,36 @@ pub fn print_table_or_error(
if let PipelineData::Value(Value::Error { error }, ..) = &pipeline_data { if let PipelineData::Value(Value::Error { error }, ..) = &pipeline_data {
let working_set = StateWorkingSet::new(engine_state); let working_set = StateWorkingSet::new(engine_state);
report_error(&working_set, error); report_error(&working_set, error);
std::process::exit(1); std::process::exit(1);
} }
match engine_state.find_decl("table".as_bytes(), &[]) { if let Some(decl_id) = engine_state.find_decl("table".as_bytes(), &[]) {
Some(decl_id) => { let command = engine_state.get_decl(decl_id);
let command = engine_state.get_decl(decl_id); if command.get_block_id().is_some() {
if command.get_block_id().is_some() { print_or_exit(pipeline_data, engine_state, config);
print_or_exit(pipeline_data, engine_state, config); } else {
} else { let table = command.run(
let table = command.run( engine_state,
engine_state, stack,
stack, &Call::new(Span::new(0, 0)),
&Call::new(Span::new(0, 0)), pipeline_data,
pipeline_data, );
);
match table { match table {
Ok(table) => { Ok(table) => {
print_or_exit(table, engine_state, config); print_or_exit(table, engine_state, config);
} }
Err(error) => { Err(error) => {
let working_set = StateWorkingSet::new(engine_state); let working_set = StateWorkingSet::new(engine_state);
report_error(&working_set, &error);
report_error(&working_set, &error); std::process::exit(1);
std::process::exit(1);
}
} }
} }
} }
None => { } else {
print_or_exit(pipeline_data, engine_state, config); print_or_exit(pipeline_data, engine_state, config);
} }
};
// Make sure everything has finished // Make sure everything has finished
if let Some(exit_code) = exit_code { if let Some(exit_code) = exit_code {
@ -199,9 +192,7 @@ fn print_or_exit(pipeline_data: PipelineData, engine_state: &mut EngineState, co
std::process::exit(1); std::process::exit(1);
} }
let mut out = item.into_string("\n", config); let out = item.into_string("\n", config) + "\n";
out.push('\n');
let _ = stdout_write_all_and_flush(out).map_err(|err| eprintln!("{}", err)); let _ = stdout_write_all_and_flush(out).map_err(|err| eprintln!("{}", err));
} }
} }