Remove Span::unknown (#525)

This commit is contained in:
JT
2021-12-19 18:46:13 +11:00
committed by GitHub
parent b54e9b6bfd
commit 2883d6cd1e
183 changed files with 1291 additions and 1124 deletions

View File

@ -47,7 +47,7 @@ impl Command for SubCommand {
.to_string()
.as_bytes()
.to_vec(),
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -55,7 +55,7 @@ impl Command for SubCommand {
example: "1 | into binary",
result: Some(Value::Binary {
val: i64::from(1).to_le_bytes().to_vec(),
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -63,7 +63,7 @@ impl Command for SubCommand {
example: "$true | into binary",
result: Some(Value::Binary {
val: i64::from(1).to_le_bytes().to_vec(),
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -81,7 +81,7 @@ impl Command for SubCommand {
example: "1.234 | into binary",
result: Some(Value::Binary {
val: 1.234f64.to_le_bytes().to_vec(),
span: Span::unknown(),
span: Span::test_data(),
}),
},
]

View File

@ -316,11 +316,11 @@ mod tests {
fn takes_a_date_format() {
let date_str = Value::test_string("16.11.1984 8:00 am +0000");
let fmt_options = Some(DatetimeFormat("%d.%m.%Y %H:%M %P %z".to_string()));
let actual = action(&date_str, &None, &fmt_options, Span::unknown());
let actual = action(&date_str, &None, &fmt_options, Span::test_data());
let expected = Value::Date {
val: DateTime::parse_from_str("16.11.1984 8:00 am +0000", "%d.%m.%Y %H:%M %P %z")
.unwrap(),
span: Span::unknown(),
span: Span::test_data(),
};
assert_eq!(actual, expected)
}
@ -328,11 +328,11 @@ mod tests {
#[test]
fn takes_iso8601_date_format() {
let date_str = Value::test_string("2020-08-04T16:39:18+00:00");
let actual = action(&date_str, &None, &None, Span::unknown());
let actual = action(&date_str, &None, &None, Span::test_data());
let expected = Value::Date {
val: DateTime::parse_from_str("2020-08-04T16:39:18+00:00", "%Y-%m-%dT%H:%M:%S%z")
.unwrap(),
span: Span::unknown(),
span: Span::test_data(),
};
assert_eq!(actual, expected)
}
@ -342,13 +342,13 @@ mod tests {
let date_str = Value::test_string("1614434140");
let timezone_option = Some(Spanned {
item: Zone::East(8),
span: Span::unknown(),
span: Span::test_data(),
});
let actual = action(&date_str, &timezone_option, &None, Span::unknown());
let actual = action(&date_str, &timezone_option, &None, Span::test_data());
let expected = Value::Date {
val: DateTime::parse_from_str("2021-02-27 21:55:40 +08:00", "%Y-%m-%d %H:%M:%S %z")
.unwrap(),
span: Span::unknown(),
span: Span::test_data(),
};
assert_eq!(actual, expected)
@ -359,12 +359,12 @@ mod tests {
let date_str = Value::test_string("1614434140");
let timezone_option = Some(Spanned {
item: Zone::Local,
span: Span::unknown(),
span: Span::test_data(),
});
let actual = action(&date_str, &timezone_option, &None, Span::unknown());
let actual = action(&date_str, &timezone_option, &None, Span::test_data());
let expected = Value::Date {
val: Local.timestamp(1614434140, 0).into(),
span: Span::unknown(),
span: Span::test_data(),
};
assert_eq!(actual, expected)
@ -375,9 +375,9 @@ mod tests {
let date_str = Value::test_string("10440970000000");
let timezone_option = Some(Spanned {
item: Zone::Utc,
span: Span::unknown(),
span: Span::test_data(),
});
let actual = action(&date_str, &timezone_option, &None, Span::unknown());
let actual = action(&date_str, &timezone_option, &None, Span::test_data());
assert_eq!(actual.get_type(), Error);
}
@ -386,7 +386,7 @@ mod tests {
fn communicates_parsing_error_given_an_invalid_datetimelike_string() {
let date_str = Value::test_string("16.11.1984 8:00 am Oops0000");
let fmt_options = Some(DatetimeFormat("%d.%m.%Y %H:%M %P %z".to_string()));
let actual = action(&date_str, &None, &fmt_options, Span::unknown());
let actual = action(&date_str, &None, &fmt_options, Span::test_data());
assert_eq!(actual.get_type(), Error);
}

View File

@ -44,9 +44,9 @@ impl Command for SubCommand {
vals: vec![Value::Record {
cols: vec!["num".to_string()],
vals: vec![Value::test_float(5.01)],
span: Span::unknown(),
span: Span::test_data(),
}],
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -142,7 +142,7 @@ mod tests {
let word = Value::test_string("3.1415");
let expected = Value::test_float(3.1415);
let actual = action(&word, Span::unknown());
let actual = action(&word, Span::test_data());
assert_eq!(actual, expected);
}
@ -150,7 +150,7 @@ mod tests {
fn communicates_parsing_error_given_an_invalid_decimallike_string() {
let decimal_str = Value::test_string("11.6anra");
let actual = action(&decimal_str, Span::unknown());
let actual = action(&decimal_str, Span::test_data());
assert_eq!(actual.get_type(), Error);
}
@ -159,7 +159,7 @@ mod tests {
fn int_to_decimal() {
let decimal_str = Value::test_int(10);
let expected = Value::test_float(10.0);
let actual = action(&decimal_str, Span::unknown());
let actual = action(&decimal_str, Span::test_data());
assert_eq!(actual, expected);
}

View File

@ -49,7 +49,7 @@ impl Command for SubCommand {
example: "'2' | into filesize",
result: Some(Value::Filesize {
val: 2,
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -57,7 +57,7 @@ impl Command for SubCommand {
example: "8.3 | into filesize",
result: Some(Value::Filesize {
val: 8,
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -65,7 +65,7 @@ impl Command for SubCommand {
example: "5 | into filesize",
result: Some(Value::Filesize {
val: 5,
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -73,7 +73,7 @@ impl Command for SubCommand {
example: "4KB | into filesize",
result: Some(Value::Filesize {
val: 4000,
span: Span::unknown(),
span: Span::test_data(),
}),
},
]

View File

@ -70,7 +70,7 @@ impl Command for SubCommand {
example: "4KB | into int",
result: Some(Value::Int {
val: 4000,
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -78,7 +78,7 @@ impl Command for SubCommand {
example: "[$false, $true] | into int",
result: Some(Value::List {
vals: vec![Value::test_int(0), Value::test_int(1)],
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -273,21 +273,21 @@ mod test {
let word = Value::test_string("10");
let expected = Value::test_int(10);
let actual = action(&word, Span::unknown(), 10);
let actual = action(&word, Span::test_data(), 10);
assert_eq!(actual, expected);
}
#[test]
fn turns_binary_to_integer() {
let s = Value::test_string("0b101");
let actual = action(&s, Span::unknown(), 10);
let actual = action(&s, Span::test_data(), 10);
assert_eq!(actual, Value::test_int(5));
}
#[test]
fn turns_hex_to_integer() {
let s = Value::test_string("0xFF");
let actual = action(&s, Span::unknown(), 16);
let actual = action(&s, Span::test_data(), 16);
assert_eq!(actual, Value::test_int(255));
}
@ -295,7 +295,7 @@ mod test {
fn communicates_parsing_error_given_an_invalid_integerlike_string() {
let integer_str = Value::test_string("36anra");
let actual = action(&integer_str, Span::unknown(), 10);
let actual = action(&integer_str, Span::test_data(), 10);
assert_eq!(actual.get_type(), Error)
}

View File

@ -53,7 +53,7 @@ impl Command for SubCommand {
example: "1.7 | into string -d 0",
result: Some(Value::String {
val: "2".to_string(),
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -61,7 +61,7 @@ impl Command for SubCommand {
example: "1.7 | into string -d 1",
result: Some(Value::String {
val: "1.7".to_string(),
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -69,7 +69,7 @@ impl Command for SubCommand {
example: "1.734 | into string -d 2",
result: Some(Value::String {
val: "1.73".to_string(),
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -80,7 +80,7 @@ impl Command for SubCommand {
// result: Some(Value::Error {
// error: ShellError::UnsupportedInput(
// String::from("Cannot accept negative integers for decimals arguments"),
// Span::unknown(),
// Span::test_data(),
// ),
// }),
},
@ -89,7 +89,7 @@ impl Command for SubCommand {
example: "4.3 | into string",
result: Some(Value::String {
val: "4.3".to_string(),
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -97,7 +97,7 @@ impl Command for SubCommand {
example: "'1234' | into string",
result: Some(Value::String {
val: "1234".to_string(),
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {
@ -105,7 +105,7 @@ impl Command for SubCommand {
example: "$true | into string",
result: Some(Value::String {
val: "true".to_string(),
span: Span::unknown(),
span: Span::test_data(),
}),
},
Example {