forked from extern/nushell
Remove Span::unknown (#525)
This commit is contained in:
@ -31,7 +31,7 @@ impl Command for BuildString {
|
||||
description: "Builds a string from letters a b c",
|
||||
result: Some(Value::String {
|
||||
val: "abc".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -39,7 +39,7 @@ impl Command for BuildString {
|
||||
description: "Builds a string from letters a b c",
|
||||
result: Some(Value::String {
|
||||
val: "3=one plus two".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
|
@ -57,7 +57,7 @@ impl Command for Format {
|
||||
example: "echo [[col1, col2]; [v1, v2] [v3, v4]] | format '{col2}'",
|
||||
result: Some(Value::List {
|
||||
vals: vec![Value::test_string("v2"), Value::test_string("v4")],
|
||||
span: Span::new(0, 0),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
@ -124,11 +124,8 @@ fn format(
|
||||
|
||||
// We can only handle a Record or a List of Record's
|
||||
match data_as_value {
|
||||
Value::Record { .. } => match format_record(format_operations, &data_as_value) {
|
||||
Ok(value) => Ok(PipelineData::Value(
|
||||
Value::string(value, Span::unknown()),
|
||||
None,
|
||||
)),
|
||||
Value::Record { .. } => match format_record(format_operations, &data_as_value, span) {
|
||||
Ok(value) => Ok(PipelineData::Value(Value::string(value, span), None)),
|
||||
Err(value) => Err(value),
|
||||
},
|
||||
|
||||
@ -136,9 +133,9 @@ fn format(
|
||||
let mut list = vec![];
|
||||
for val in vals.iter() {
|
||||
match val {
|
||||
Value::Record { .. } => match format_record(format_operations, val) {
|
||||
Value::Record { .. } => match format_record(format_operations, val, span) {
|
||||
Ok(value) => {
|
||||
list.push(Value::string(value, Span::unknown()));
|
||||
list.push(Value::string(value, span));
|
||||
}
|
||||
Err(value) => {
|
||||
return Err(value);
|
||||
@ -148,7 +145,7 @@ fn format(
|
||||
_ => {
|
||||
return Err(ShellError::UnsupportedInput(
|
||||
"Input data is not supported by this command.".to_string(),
|
||||
Span::unknown(),
|
||||
span,
|
||||
))
|
||||
}
|
||||
}
|
||||
@ -161,7 +158,7 @@ fn format(
|
||||
}
|
||||
_ => Err(ShellError::UnsupportedInput(
|
||||
"Input data is not supported by this command.".to_string(),
|
||||
Span::unknown(),
|
||||
span,
|
||||
)),
|
||||
}
|
||||
}
|
||||
@ -169,6 +166,7 @@ fn format(
|
||||
fn format_record(
|
||||
format_operations: &[FormatOperation],
|
||||
data_as_value: &Value,
|
||||
span: Span,
|
||||
) -> Result<String, ShellError> {
|
||||
let mut output = String::new();
|
||||
for op in format_operations {
|
||||
@ -182,7 +180,7 @@ fn format_record(
|
||||
.clone()
|
||||
.follow_cell_path(&[PathMember::String {
|
||||
val: col_name.clone(),
|
||||
span: Span::unknown(),
|
||||
span,
|
||||
}]) {
|
||||
Ok(value_at_column) => output.push_str(value_at_column.as_string()?.as_str()),
|
||||
Err(se) => return Err(se),
|
||||
|
@ -35,9 +35,9 @@ impl Command for Parse {
|
||||
vals: vec![Value::Record {
|
||||
cols: vec!["foo".to_string(), "bar".to_string()],
|
||||
vals: vec![Value::test_string("hi"), Value::test_string("there")],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
vec![
|
||||
|
@ -47,22 +47,22 @@ impl Command for Size {
|
||||
vals: vec![
|
||||
Value::Int {
|
||||
val: 0,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 7,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 38,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 38,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -78,22 +78,22 @@ impl Command for Size {
|
||||
vals: vec![
|
||||
Value::Int {
|
||||
val: 0,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 2,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 13,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 15,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
|
@ -32,7 +32,7 @@ impl Command for SubCommand {
|
||||
Value::test_string("l"),
|
||||
Value::test_string("o"),
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
}]
|
||||
}
|
||||
|
@ -44,7 +44,7 @@ impl Command for SubCommand {
|
||||
example: "'good day' | str capitalize",
|
||||
result: Some(Value::String {
|
||||
val: "Good day".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -52,7 +52,7 @@ impl Command for SubCommand {
|
||||
example: "'anton' | str capitalize",
|
||||
result: Some(Value::String {
|
||||
val: "Anton".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -60,17 +60,17 @@ impl Command for SubCommand {
|
||||
example: "[[lang, gems]; [nu_test, 100]] | str capitalize lang",
|
||||
result: Some(Value::List {
|
||||
vals: vec![Value::Record {
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
cols: vec!["lang".to_string(), "gems".to_string()],
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "Nu_test".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::test_int(100),
|
||||
],
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
@ -117,7 +117,7 @@ fn action(input: &Value, head: Span) -> Value {
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
|
@ -46,7 +46,7 @@ impl Command for SubCommand {
|
||||
example: " 'NuShell' | str camel-case",
|
||||
result: Some(Value::String {
|
||||
val: "nuShell".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -54,7 +54,7 @@ impl Command for SubCommand {
|
||||
example: "'this-is-the-first-case' | str camel-case",
|
||||
result: Some(Value::String {
|
||||
val: "thisIsTheFirstCase".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -62,7 +62,7 @@ impl Command for SubCommand {
|
||||
example: " 'this_is_the_second_case' | str camel-case",
|
||||
result: Some(Value::String {
|
||||
val: "thisIsTheSecondCase".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -70,17 +70,17 @@ impl Command for SubCommand {
|
||||
example: r#"[[lang, gems]; [nu_test, 100]] | str camel-case lang"#,
|
||||
result: Some(Value::List {
|
||||
vals: vec![Value::Record {
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
cols: vec!["lang".to_string(), "gems".to_string()],
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "nuTest".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::test_int(100),
|
||||
],
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
|
@ -46,7 +46,7 @@ impl Command for SubCommand {
|
||||
example: "'NuShell' | str kebab-case",
|
||||
result: Some(Value::String {
|
||||
val: "nu-shell".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -54,7 +54,7 @@ impl Command for SubCommand {
|
||||
example: "'thisIsTheFirstCase' | str kebab-case",
|
||||
result: Some(Value::String {
|
||||
val: "this-is-the-first-case".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -62,7 +62,7 @@ impl Command for SubCommand {
|
||||
example: "'THIS_IS_THE_SECOND_CASE' | str kebab-case",
|
||||
result: Some(Value::String {
|
||||
val: "this-is-the-second-case".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -70,17 +70,17 @@ impl Command for SubCommand {
|
||||
example: r#"[[lang, gems]; [nuTest, 100]] | str kebab-case lang"#,
|
||||
result: Some(Value::List {
|
||||
vals: vec![Value::Record {
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
cols: vec!["lang".to_string(), "gems".to_string()],
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "nu-test".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::test_int(100),
|
||||
],
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
|
@ -68,7 +68,7 @@ where
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
|
@ -46,7 +46,7 @@ impl Command for SubCommand {
|
||||
example: "'nu-shell' | str pascal-case",
|
||||
result: Some(Value::String {
|
||||
val: "NuShell".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -54,7 +54,7 @@ impl Command for SubCommand {
|
||||
example: "'this-is-the-first-case' | str pascal-case",
|
||||
result: Some(Value::String {
|
||||
val: "ThisIsTheFirstCase".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -62,7 +62,7 @@ impl Command for SubCommand {
|
||||
example: "'this_is_the_second_case' | str pascal-case",
|
||||
result: Some(Value::String {
|
||||
val: "ThisIsTheSecondCase".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -70,17 +70,17 @@ impl Command for SubCommand {
|
||||
example: r#"[[lang, gems]; [nu_test, 100]] | str pascal-case lang"#,
|
||||
result: Some(Value::List {
|
||||
vals: vec![Value::Record {
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
cols: vec!["lang".to_string(), "gems".to_string()],
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "NuTest".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::test_int(100),
|
||||
],
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
|
@ -45,7 +45,7 @@ impl Command for SubCommand {
|
||||
example: r#" "NuShell" | str screaming-snake-case"#,
|
||||
result: Some(Value::String {
|
||||
val: "NU_SHELL".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -53,7 +53,7 @@ impl Command for SubCommand {
|
||||
example: r#" "this_is_the_second_case" | str screaming-snake-case"#,
|
||||
result: Some(Value::String {
|
||||
val: "THIS_IS_THE_SECOND_CASE".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -61,7 +61,7 @@ impl Command for SubCommand {
|
||||
example: r#""this-is-the-first-case" | str screaming-snake-case"#,
|
||||
result: Some(Value::String {
|
||||
val: "THIS_IS_THE_FIRST_CASE".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -69,17 +69,17 @@ impl Command for SubCommand {
|
||||
example: r#"[[lang, gems]; [nu_test, 100]] | str screaming-snake-case lang"#,
|
||||
result: Some(Value::List {
|
||||
vals: vec![Value::Record {
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
cols: vec!["lang".to_string(), "gems".to_string()],
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "NU_TEST".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::test_int(100),
|
||||
],
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
|
@ -44,7 +44,7 @@ impl Command for SubCommand {
|
||||
example: r#" "NuShell" | str snake-case"#,
|
||||
result: Some(Value::String {
|
||||
val: "nu_shell".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -52,7 +52,7 @@ impl Command for SubCommand {
|
||||
example: r#" "this_is_the_second_case" | str snake-case"#,
|
||||
result: Some(Value::String {
|
||||
val: "this_is_the_second_case".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -60,7 +60,7 @@ impl Command for SubCommand {
|
||||
example: r#""this-is-the-first-case" | str snake-case"#,
|
||||
result: Some(Value::String {
|
||||
val: "this_is_the_first_case".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -68,17 +68,17 @@ impl Command for SubCommand {
|
||||
example: r#"[[lang, gems]; [nuTest, 100]] | str snake-case lang"#,
|
||||
result: Some(Value::List {
|
||||
vals: vec![Value::Record {
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
cols: vec!["lang".to_string(), "gems".to_string()],
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "nu_test".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::test_int(100),
|
||||
],
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
|
@ -67,7 +67,7 @@ impl Command for StrCollect {
|
||||
example: "['nu', 'shell'] | str collect",
|
||||
result: Some(Value::String {
|
||||
val: "nushell".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -75,7 +75,7 @@ impl Command for StrCollect {
|
||||
example: "['nu', 'shell'] | str collect '-'",
|
||||
result: Some(Value::String {
|
||||
val: "nu-shell".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
|
@ -48,7 +48,7 @@ impl Command for SubCommand {
|
||||
example: "'my_library.rb' | str contains '.rb'",
|
||||
result: Some(Value::Bool {
|
||||
val: true,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -56,7 +56,7 @@ impl Command for SubCommand {
|
||||
example: "'my_library.rb' | str contains -i '.RB'",
|
||||
result: Some(Value::Bool {
|
||||
val: true,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -68,13 +68,13 @@ impl Command for SubCommand {
|
||||
vals: vec![
|
||||
Value::Bool {
|
||||
val: true,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::test_int(100),
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -86,13 +86,13 @@ impl Command for SubCommand {
|
||||
vals: vec![
|
||||
Value::Bool {
|
||||
val: true,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::test_int(100),
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -104,16 +104,16 @@ impl Command for SubCommand {
|
||||
vals: vec![
|
||||
Value::Bool {
|
||||
val: true,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Bool {
|
||||
val: true,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -121,7 +121,7 @@ impl Command for SubCommand {
|
||||
example: "'hello' | str contains 'banana'",
|
||||
result: Some(Value::Bool {
|
||||
val: false,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
@ -177,7 +177,7 @@ fn action(input: &Value, case_insensitive: bool, pattern: &str, head: Span) -> V
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
|
@ -44,7 +44,7 @@ impl Command for SubCommand {
|
||||
example: "'NU' | str downcase",
|
||||
result: Some(Value::String {
|
||||
val: "nu".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -52,7 +52,7 @@ impl Command for SubCommand {
|
||||
example: "'TESTa' | str downcase",
|
||||
result: Some(Value::String {
|
||||
val: "testa".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -64,16 +64,16 @@ impl Command for SubCommand {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "test".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "ABC".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -85,16 +85,16 @@ impl Command for SubCommand {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "test".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "abc".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
@ -141,7 +141,7 @@ fn action(input: &Value, head: Span) -> Value {
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
|
@ -46,7 +46,7 @@ impl Command for SubCommand {
|
||||
example: "'my_library.rb' | str ends-with '.rb'",
|
||||
result: Some(Value::Bool {
|
||||
val: true,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -54,7 +54,7 @@ impl Command for SubCommand {
|
||||
example: "'my_library.rb' | str ends-with '.txt'",
|
||||
result: Some(Value::Bool {
|
||||
val: false,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
@ -106,7 +106,7 @@ fn action(input: &Value, pattern: &str, head: Span) -> Value {
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
|
@ -57,7 +57,7 @@ impl Command for SubCommand {
|
||||
example: "'my_library.rb' | str find-replace '(.+).rb' '$1.nu'",
|
||||
result: Some(Value::String {
|
||||
val: "my_library.nu".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -65,7 +65,7 @@ impl Command for SubCommand {
|
||||
example: "'abc abc abc' | str find-replace -a 'b' 'z'",
|
||||
result: Some(Value::String {
|
||||
val: "azc azc azc".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -78,20 +78,20 @@ impl Command for SubCommand {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "azc".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "abc".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "ads".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
@ -177,7 +177,7 @@ fn action(
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
@ -199,7 +199,7 @@ mod tests {
|
||||
fn can_have_capture_groups() {
|
||||
let word = Value::String {
|
||||
val: "Cargo.toml".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let options = Arguments {
|
||||
@ -209,12 +209,12 @@ mod tests {
|
||||
all: false,
|
||||
};
|
||||
|
||||
let actual = action(&word, &options, Span::unknown());
|
||||
let actual = action(&word, &options, Span::test_data());
|
||||
assert_eq!(
|
||||
actual,
|
||||
Value::String {
|
||||
val: "Carga.toml".to_string(),
|
||||
span: Span::unknown()
|
||||
span: Span::test_data()
|
||||
}
|
||||
);
|
||||
}
|
||||
|
@ -192,7 +192,7 @@ fn action(
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
@ -284,7 +284,7 @@ mod tests {
|
||||
fn returns_index_of_substring() {
|
||||
let word = Value::String {
|
||||
val: String::from("Cargo.tomL"),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let options = Arguments {
|
||||
@ -292,13 +292,13 @@ mod tests {
|
||||
|
||||
range: Some(Value::String {
|
||||
val: String::from(""),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
column_paths: vec![],
|
||||
end: false,
|
||||
};
|
||||
|
||||
let actual = action(&word, &options, Span::unknown());
|
||||
let actual = action(&word, &options, Span::test_data());
|
||||
|
||||
assert_eq!(actual, Value::test_int(5));
|
||||
}
|
||||
@ -306,7 +306,7 @@ mod tests {
|
||||
fn index_of_does_not_exist_in_string() {
|
||||
let word = Value::String {
|
||||
val: String::from("Cargo.tomL"),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let options = Arguments {
|
||||
@ -314,13 +314,13 @@ mod tests {
|
||||
|
||||
range: Some(Value::String {
|
||||
val: String::from(""),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
column_paths: vec![],
|
||||
end: false,
|
||||
};
|
||||
|
||||
let actual = action(&word, &options, Span::unknown());
|
||||
let actual = action(&word, &options, Span::test_data());
|
||||
|
||||
assert_eq!(actual, Value::test_int(-1));
|
||||
}
|
||||
@ -329,7 +329,7 @@ mod tests {
|
||||
fn returns_index_of_next_substring() {
|
||||
let word = Value::String {
|
||||
val: String::from("Cargo.Cargo"),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let options = Arguments {
|
||||
@ -337,13 +337,13 @@ mod tests {
|
||||
|
||||
range: Some(Value::String {
|
||||
val: String::from("1"),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
column_paths: vec![],
|
||||
end: false,
|
||||
};
|
||||
|
||||
let actual = action(&word, &options, Span::unknown());
|
||||
let actual = action(&word, &options, Span::test_data());
|
||||
assert_eq!(actual, Value::test_int(6));
|
||||
}
|
||||
|
||||
@ -351,7 +351,7 @@ mod tests {
|
||||
fn index_does_not_exist_due_to_end_index() {
|
||||
let word = Value::String {
|
||||
val: String::from("Cargo.Banana"),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let options = Arguments {
|
||||
@ -359,13 +359,13 @@ mod tests {
|
||||
|
||||
range: Some(Value::String {
|
||||
val: String::from(",5"),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
column_paths: vec![],
|
||||
end: false,
|
||||
};
|
||||
|
||||
let actual = action(&word, &options, Span::unknown());
|
||||
let actual = action(&word, &options, Span::test_data());
|
||||
assert_eq!(actual, Value::test_int(-1));
|
||||
}
|
||||
|
||||
@ -373,7 +373,7 @@ mod tests {
|
||||
fn returns_index_of_nums_in_middle_due_to_index_limit_from_both_ends() {
|
||||
let word = Value::String {
|
||||
val: String::from("123123123"),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let options = Arguments {
|
||||
@ -381,13 +381,13 @@ mod tests {
|
||||
|
||||
range: Some(Value::String {
|
||||
val: String::from("2,6"),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
column_paths: vec![],
|
||||
end: false,
|
||||
};
|
||||
|
||||
let actual = action(&word, &options, Span::unknown());
|
||||
let actual = action(&word, &options, Span::test_data());
|
||||
assert_eq!(actual, Value::test_int(3));
|
||||
}
|
||||
|
||||
@ -395,7 +395,7 @@ mod tests {
|
||||
fn index_does_not_exists_due_to_strict_bounds() {
|
||||
let word = Value::String {
|
||||
val: String::from("123456"),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let options = Arguments {
|
||||
@ -403,13 +403,13 @@ mod tests {
|
||||
|
||||
range: Some(Value::String {
|
||||
val: String::from("2,4"),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
column_paths: vec![],
|
||||
end: false,
|
||||
};
|
||||
|
||||
let actual = action(&word, &options, Span::unknown());
|
||||
let actual = action(&word, &options, Span::test_data());
|
||||
assert_eq!(actual, Value::test_int(-1));
|
||||
}
|
||||
}
|
||||
|
@ -49,7 +49,7 @@ impl Command for SubCommand {
|
||||
example: "['hi' 'there'] | str length",
|
||||
result: Some(Value::List {
|
||||
vals: vec![Value::test_int(2), Value::test_int(5)],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
@ -96,7 +96,7 @@ fn action(input: &Value, head: Span) -> Value {
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
|
@ -58,7 +58,7 @@ impl Command for SubCommand {
|
||||
example: "'nushell' | str lpad -l 10 -c '*'",
|
||||
result: Some(Value::String {
|
||||
val: "***nushell".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -66,7 +66,7 @@ impl Command for SubCommand {
|
||||
example: "'123' | str lpad -l 10 -c '0'",
|
||||
result: Some(Value::String {
|
||||
val: "0000000123".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -74,7 +74,7 @@ impl Command for SubCommand {
|
||||
example: "'123456789' | str lpad -l 3 -c '0'",
|
||||
result: Some(Value::String {
|
||||
val: "123".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -82,7 +82,7 @@ impl Command for SubCommand {
|
||||
example: "'▉' | str lpad -l 10 -c '▉'",
|
||||
result: Some(Value::String {
|
||||
val: "▉▉▉▉▉▉▉▉▉▉".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
@ -154,7 +154,7 @@ fn action(
|
||||
None => Value::Error {
|
||||
error: ShellError::UnsupportedInput(
|
||||
String::from("Length argument is missing"),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
},
|
||||
@ -164,7 +164,7 @@ fn action(
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
|
@ -43,7 +43,7 @@ impl Command for SubCommand {
|
||||
example: "'Nushell' | str reverse",
|
||||
result: Some(Value::String {
|
||||
val: "llehsuN".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
}]
|
||||
}
|
||||
@ -90,7 +90,7 @@ fn action(input: &Value, head: Span) -> Value {
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
|
@ -58,7 +58,7 @@ impl Command for SubCommand {
|
||||
example: "'nushell' | str rpad -l 10 -c '*'",
|
||||
result: Some(Value::String {
|
||||
val: "nushell***".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -66,7 +66,7 @@ impl Command for SubCommand {
|
||||
example: "'123' | str rpad -l 10 -c '0'",
|
||||
result: Some(Value::String {
|
||||
val: "1230000000".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -74,7 +74,7 @@ impl Command for SubCommand {
|
||||
example: "'123456789' | str rpad -l 3 -c '0'",
|
||||
result: Some(Value::String {
|
||||
val: "123".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -82,7 +82,7 @@ impl Command for SubCommand {
|
||||
example: "'▉' | str rpad -l 10 -c '▉'",
|
||||
result: Some(Value::String {
|
||||
val: "▉▉▉▉▉▉▉▉▉▉".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
@ -153,7 +153,7 @@ fn action(
|
||||
None => Value::Error {
|
||||
error: ShellError::UnsupportedInput(
|
||||
String::from("Length argument is missing"),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
},
|
||||
@ -163,7 +163,7 @@ fn action(
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
|
@ -53,7 +53,7 @@ impl Command for SubCommand {
|
||||
example: "'my_library.rb' | str starts-with 'my'",
|
||||
result: Some(Value::Bool {
|
||||
val: true,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -61,7 +61,7 @@ impl Command for SubCommand {
|
||||
example: "'Cargo.toml' | str starts-with 'Car'",
|
||||
result: Some(Value::Bool {
|
||||
val: true,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
Example {
|
||||
@ -69,7 +69,7 @@ impl Command for SubCommand {
|
||||
example: "'Cargo.toml' | str starts-with '.toml'",
|
||||
result: Some(Value::Bool {
|
||||
val: false,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}),
|
||||
},
|
||||
]
|
||||
@ -127,7 +127,7 @@ fn action(input: &Value, Arguments { pattern, .. }: &Arguments, head: Span) -> V
|
||||
"Input's type is {}. This command only works with strings.",
|
||||
other.get_type()
|
||||
),
|
||||
Span::unknown(),
|
||||
head,
|
||||
),
|
||||
},
|
||||
}
|
||||
|
@ -305,7 +305,7 @@ mod tests {
|
||||
fn substrings_indexes() {
|
||||
let word = Value::String {
|
||||
val: "andres".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let cases = vec![
|
||||
@ -336,13 +336,13 @@ mod tests {
|
||||
|
||||
for expectation in &cases {
|
||||
let expected = expectation.expected;
|
||||
let actual = action(&word, &expectation.options(), Span::unknown());
|
||||
let actual = action(&word, &expectation.options(), Span::test_data());
|
||||
|
||||
assert_eq!(
|
||||
actual,
|
||||
Value::String {
|
||||
val: expected.to_string(),
|
||||
span: Span::unknown()
|
||||
span: Span::test_data()
|
||||
}
|
||||
);
|
||||
}
|
||||
|
@ -328,10 +328,10 @@ mod tests {
|
||||
.iter()
|
||||
.map(|x| Value::String {
|
||||
val: x.to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
})
|
||||
.collect(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}
|
||||
}
|
||||
|
||||
@ -341,10 +341,10 @@ mod tests {
|
||||
.iter()
|
||||
.map(|x| Value::String {
|
||||
val: x.to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
})
|
||||
.collect(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
}
|
||||
}
|
||||
|
||||
@ -359,7 +359,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -379,7 +379,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -399,7 +399,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&number,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -420,7 +420,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -440,7 +440,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -460,7 +460,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some('!'),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -479,7 +479,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some(' '),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -503,7 +503,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -518,35 +518,35 @@ mod tests {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: " nu shell ".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: " d".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "nushell".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "d".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let closure_flags = ClosureFlags {
|
||||
@ -556,7 +556,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -576,7 +576,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some('.'),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -596,7 +596,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some('!'),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -611,35 +611,35 @@ mod tests {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "##nu####shell##".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "#d".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "nushell".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "d".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let closure_flags = ClosureFlags {
|
||||
@ -649,7 +649,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some('#'),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -669,7 +669,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -689,7 +689,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&number,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -709,7 +709,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -729,7 +729,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -744,35 +744,35 @@ mod tests {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: " a ".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: " d".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "a ".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "d".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let closure_flags = ClosureFlags {
|
||||
@ -782,7 +782,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -802,7 +802,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some('!'),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -821,7 +821,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -841,7 +841,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -861,7 +861,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&number,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -881,7 +881,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -896,35 +896,35 @@ mod tests {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: " a ".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: " d".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: " a".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: " d".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let closure_flags = ClosureFlags {
|
||||
@ -934,7 +934,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -954,7 +954,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some('#'),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -974,7 +974,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some(' '),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -994,7 +994,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some(' '),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -1013,7 +1013,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&number,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -1033,7 +1033,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -1048,35 +1048,35 @@ mod tests {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: " a b c d ".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: " b c d e f".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
let expected = Value::List {
|
||||
vals: vec![
|
||||
Value::String {
|
||||
val: "a b c d".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::Int {
|
||||
val: 65,
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
Value::String {
|
||||
val: "b c d e f".to_string(),
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
],
|
||||
span: Span::unknown(),
|
||||
span: Span::test_data(),
|
||||
};
|
||||
|
||||
let closure_flags = ClosureFlags {
|
||||
@ -1086,7 +1086,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&row,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
None,
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -1106,7 +1106,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some('.'),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -1127,7 +1127,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some(' '),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
@ -1148,7 +1148,7 @@ mod tests {
|
||||
|
||||
let actual = action(
|
||||
&word,
|
||||
Span::unknown(),
|
||||
Span::test_data(),
|
||||
Some(' '),
|
||||
&closure_flags,
|
||||
&trim,
|
||||
|
@ -102,7 +102,7 @@ mod tests {
|
||||
fn upcases() {
|
||||
let word = Value::test_string("andres");
|
||||
|
||||
let actual = action(&word, Span::unknown());
|
||||
let actual = action(&word, Span::test_data());
|
||||
let expected = Value::test_string("ANDRES");
|
||||
assert_eq!(actual, expected);
|
||||
}
|
||||
|
Reference in New Issue
Block a user