forked from extern/nushell
Remove 'empty' block support reminders, for now. (#5214)
This commit is contained in:
committed by
GitHub
parent
07893e01c1
commit
7a7aa310aa
@ -31,6 +31,10 @@ impl Span {
|
||||
Span { start, end }
|
||||
}
|
||||
|
||||
pub fn unknown() -> Self {
|
||||
Self::new(0, 0)
|
||||
}
|
||||
|
||||
/// Note: Only use this for test data, *not* live data, as it will point into unknown source
|
||||
/// when used in errors.
|
||||
pub fn test_data() -> Span {
|
||||
|
@ -586,12 +586,9 @@ impl Value {
|
||||
pub fn is_empty(&self) -> bool {
|
||||
match self {
|
||||
Value::String { val, .. } => val.is_empty(),
|
||||
Value::List { vals, .. } => {
|
||||
vals.is_empty() && vals.iter().all(|v| v.clone().is_empty())
|
||||
}
|
||||
Value::Record { cols, vals, .. } => {
|
||||
cols.iter().all(|v| v.is_empty()) && vals.iter().all(|v| v.clone().is_empty())
|
||||
}
|
||||
Value::List { vals, .. } => vals.is_empty(),
|
||||
Value::Record { cols, .. } => cols.is_empty(),
|
||||
Value::Binary { val, .. } => val.is_empty(),
|
||||
Value::Nothing { .. } => true,
|
||||
_ => false,
|
||||
}
|
||||
@ -2421,3 +2418,63 @@ fn get_config_filesize_format(config: &Config) -> (ByteUnit, &str) {
|
||||
|
||||
filesize_format
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
|
||||
use super::{Span, Value};
|
||||
|
||||
mod is_empty {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_string() {
|
||||
let value = Value::string("", Span::unknown());
|
||||
assert!(value.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_list() {
|
||||
let list_with_no_values = Value::List {
|
||||
vals: vec![],
|
||||
span: Span::unknown(),
|
||||
};
|
||||
let list_with_one_empty_string = Value::List {
|
||||
vals: vec![Value::string("", Span::unknown())],
|
||||
span: Span::unknown(),
|
||||
};
|
||||
|
||||
assert!(list_with_no_values.is_empty());
|
||||
assert!(!list_with_one_empty_string.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_record() {
|
||||
let no_columns_nor_cell_values = Value::Record {
|
||||
cols: vec![],
|
||||
vals: vec![],
|
||||
span: Span::unknown(),
|
||||
};
|
||||
let one_column_and_one_cell_value_with_empty_strings = Value::Record {
|
||||
cols: vec![String::from("")],
|
||||
vals: vec![Value::string("", Span::unknown())],
|
||||
span: Span::unknown(),
|
||||
};
|
||||
let one_column_with_a_string_and_one_cell_value_with_empty_string = Value::Record {
|
||||
cols: vec![String::from("column")],
|
||||
vals: vec![Value::string("", Span::unknown())],
|
||||
span: Span::unknown(),
|
||||
};
|
||||
let one_column_with_empty_string_and_one_value_with_a_string = Value::Record {
|
||||
cols: vec![String::from("")],
|
||||
vals: vec![Value::string("text", Span::unknown())],
|
||||
span: Span::unknown(),
|
||||
};
|
||||
|
||||
assert!(no_columns_nor_cell_values.is_empty());
|
||||
assert!(!one_column_and_one_cell_value_with_empty_strings.is_empty());
|
||||
assert!(!one_column_with_a_string_and_one_cell_value_with_empty_string.is_empty());
|
||||
assert!(!one_column_with_empty_string_and_one_value_with_a_string.is_empty());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user