mirror of
https://github.com/nushell/nushell.git
synced 2025-08-13 18:27:19 +02:00
Reduced LOC by replacing several instances of Value::Int {}
, Value::Float{}
, Value::Bool {}
, and Value::String {}
with Value::int()
, Value::float()
, Value::boolean()
and Value::string()
(#7412)
# Description While perusing Value.rs, I noticed the `Value::int()`, `Value::float()`, `Value::boolean()` and `Value::string()` constructors, which seem designed to make it easier to construct various Values, but which aren't used often at all in the codebase. So, using a few find-replaces regexes, I increased their usage. This reduces overall LOC because structures like this: ``` Value::Int { val: a, span: head } ``` are changed into ``` Value::int(a, head) ``` and are respected as such by the project's formatter. There are little readability concerns because the second argument to all of these is `span`, and it's almost always extremely obvious which is the span at every callsite. # User-Facing Changes None. # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
This commit is contained in:
@ -53,25 +53,16 @@ impl Command for Enter {
|
||||
));
|
||||
}
|
||||
|
||||
let new_path = Value::String {
|
||||
val: new_path.to_string_lossy().to_string(),
|
||||
span: call.head,
|
||||
};
|
||||
let new_path = Value::string(new_path.to_string_lossy(), call.head);
|
||||
|
||||
let cwd = Value::String {
|
||||
val: cwd.to_string_lossy().to_string(),
|
||||
span: call.head,
|
||||
};
|
||||
let cwd = Value::string(cwd.to_string_lossy(), call.head);
|
||||
|
||||
let mut shells = get_shells(engine_state, stack, cwd);
|
||||
let mut current_shell = get_current_shell(engine_state, stack);
|
||||
|
||||
stack.add_env_var(
|
||||
"NUSHELL_LAST_SHELL".into(),
|
||||
Value::Int {
|
||||
val: current_shell as i64,
|
||||
span: call.head,
|
||||
},
|
||||
Value::int(current_shell as i64, call.head),
|
||||
);
|
||||
|
||||
if current_shell + 1 > shells.len() {
|
||||
@ -91,10 +82,7 @@ impl Command for Enter {
|
||||
);
|
||||
stack.add_env_var(
|
||||
"NUSHELL_CURRENT_SHELL".into(),
|
||||
Value::Int {
|
||||
val: current_shell as i64,
|
||||
span: call.head,
|
||||
},
|
||||
Value::int(current_shell as i64, call.head),
|
||||
);
|
||||
|
||||
stack.add_env_var("PWD".into(), new_path);
|
||||
|
@ -53,10 +53,7 @@ impl Command for Exit {
|
||||
}
|
||||
|
||||
let cwd = current_dir(engine_state, stack)?;
|
||||
let cwd = Value::String {
|
||||
val: cwd.to_string_lossy().to_string(),
|
||||
span: call.head,
|
||||
};
|
||||
let cwd = Value::string(cwd.to_string_lossy(), call.head);
|
||||
|
||||
let mut shells = get_shells(engine_state, stack, cwd);
|
||||
let mut current_shell = get_current_shell(engine_state, stack);
|
||||
@ -86,17 +83,11 @@ impl Command for Exit {
|
||||
);
|
||||
stack.add_env_var(
|
||||
"NUSHELL_CURRENT_SHELL".into(),
|
||||
Value::Int {
|
||||
val: current_shell as i64,
|
||||
span: call.head,
|
||||
},
|
||||
Value::int(current_shell as i64, call.head),
|
||||
);
|
||||
stack.add_env_var(
|
||||
"NUSHELL_LAST_SHELL".into(),
|
||||
Value::Int {
|
||||
val: last_shell as i64,
|
||||
span: call.head,
|
||||
},
|
||||
Value::int(last_shell as i64, call.head),
|
||||
);
|
||||
|
||||
stack.add_env_var("PWD".into(), new_path);
|
||||
|
@ -61,10 +61,7 @@ fn switch_shell(
|
||||
switch_to: SwitchTo,
|
||||
) -> Result<PipelineData, ShellError> {
|
||||
let cwd = current_dir(engine_state, stack)?;
|
||||
let cwd = Value::String {
|
||||
val: cwd.to_string_lossy().to_string(),
|
||||
span: call.head,
|
||||
};
|
||||
let cwd = Value::string(cwd.to_string_lossy(), call.head);
|
||||
|
||||
let shells = get_shells(engine_state, stack, cwd);
|
||||
let current_shell = get_current_shell(engine_state, stack);
|
||||
@ -105,18 +102,12 @@ fn switch_shell(
|
||||
|
||||
stack.add_env_var(
|
||||
"NUSHELL_CURRENT_SHELL".into(),
|
||||
Value::Int {
|
||||
val: new_shell as i64,
|
||||
span: call.head,
|
||||
},
|
||||
Value::int(new_shell as i64, call.head),
|
||||
);
|
||||
|
||||
stack.add_env_var(
|
||||
"NUSHELL_LAST_SHELL".into(),
|
||||
Value::Int {
|
||||
val: current_shell as i64,
|
||||
span: call.head,
|
||||
},
|
||||
Value::int(current_shell as i64, call.head),
|
||||
);
|
||||
|
||||
stack.add_env_var("PWD".into(), new_path);
|
||||
|
Reference in New Issue
Block a user