extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 02:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

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)

Browse Source 
# 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:
Leon
2022-12-10 02:37:51 +10:00
committed by GitHub
parent b56ad92e25
commit 220b105efb
139 changed files with 540 additions and 2141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
crates/nu_plugin_gstat/src/gstat.rs
View File

@ -152,80 +152,35 @@ impl GStat {
let mut vals = vec![];
cols.push("idx_added_staged".into());
vals.push(Value::Int {
val: stats.idx_added_staged as i64,
span: *span,
});
vals.push(Value::int(stats.idx_added_staged as i64, *span));
cols.push("idx_modified_staged".into());
vals.push(Value::Int {
val: stats.idx_modified_staged as i64,
span: *span,
});
vals.push(Value::int(stats.idx_modified_staged as i64, *span));
cols.push("idx_deleted_staged".into());
vals.push(Value::Int {
val: stats.idx_deleted_staged as i64,
span: *span,
});
vals.push(Value::int(stats.idx_deleted_staged as i64, *span));
cols.push("idx_renamed".into());
vals.push(Value::Int {
val: stats.idx_renamed as i64,
span: *span,
});
vals.push(Value::int(stats.idx_renamed as i64, *span));
cols.push("idx_type_changed".into());
vals.push(Value::Int {
val: stats.idx_type_changed as i64,
span: *span,
});
vals.push(Value::int(stats.idx_type_changed as i64, *span));
cols.push("wt_untracked".into());
vals.push(Value::Int {
val: stats.wt_untracked as i64,
span: *span,
});
vals.push(Value::int(stats.wt_untracked as i64, *span));
cols.push("wt_modified".into());
vals.push(Value::Int {
val: stats.wt_modified as i64,
span: *span,
});
vals.push(Value::int(stats.wt_modified as i64, *span));
cols.push("wt_deleted".into());
vals.push(Value::Int {
val: stats.wt_deleted as i64,
span: *span,
});
vals.push(Value::int(stats.wt_deleted as i64, *span));
cols.push("wt_type_changed".into());
vals.push(Value::Int {
val: stats.wt_type_changed as i64,
span: *span,
});
vals.push(Value::int(stats.wt_type_changed as i64, *span));
cols.push("wt_renamed".into());
vals.push(Value::Int {
val: stats.wt_renamed as i64,
span: *span,
});
vals.push(Value::int(stats.wt_renamed as i64, *span));
cols.push("ignored".into());
vals.push(Value::Int {
val: stats.ignored as i64,
span: *span,
});
vals.push(Value::int(stats.ignored as i64, *span));
cols.push("conflicts".into());
vals.push(Value::Int {
val: stats.conflicts as i64,
span: *span,
});
vals.push(Value::int(stats.conflicts as i64, *span));
cols.push("ahead".into());
vals.push(Value::Int {
val: stats.ahead as i64,
span: *span,
});
vals.push(Value::int(stats.ahead as i64, *span));
cols.push("behind".into());
vals.push(Value::Int {
val: stats.behind as i64,
span: *span,
});
vals.push(Value::int(stats.behind as i64, *span));
cols.push("stashes".into());
vals.push(Value::Int {
val: stats.stashes as i64,
span: *span,
});
vals.push(Value::int(stats.stashes as i64, *span));
cols.push("repo_name".into());
vals.push(Value::String {
val: repo_name,
@ -269,100 +224,43 @@ impl GStat {
let mut vals = vec![];
cols.push("idx_added_staged".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("idx_modified_staged".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("idx_deleted_staged".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("idx_renamed".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("idx_type_changed".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("wt_untracked".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("wt_modified".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("wt_deleted".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("wt_type_changed".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("wt_renamed".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("ignored".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("conflicts".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("ahead".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("behind".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("stashes".into());
vals.push(Value::Int {
val: -1,
span: *span,
});
vals.push(Value::int(-1, *span));
cols.push("repo_name".into());
vals.push(Value::String {
val: "no_repository".to_string(),
span: *span,
});
vals.push(Value::string("no_repository", *span));
cols.push("tag".into());
vals.push(Value::String {
val: "no_tag".to_string(),
span: *span,
});
vals.push(Value::string("no_tag", *span));
cols.push("branch".into());
vals.push(Value::String {
val: "no_branch".to_string(),
span: *span,
});
vals.push(Value::string("no_branch", *span));
cols.push("remote".into());
vals.push(Value::String {
val: "no_remote".to_string(),
span: *span,
});
vals.push(Value::string("no_remote", *span));
Value::Record {
cols,