Fix CI failures after PR merge conflicts (#7072)

This commit is contained in:
Reilly Wood 2022-11-09 15:24:57 -08:00 committed by GitHub
parent 53a9264b67
commit aed8d3800b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 15 deletions

4
Cargo.lock generated
View File

@ -2765,8 +2765,8 @@ dependencies = [
"num-format",
"serde",
"serde_json",
"strum 0.24.1",
"strum_macros 0.24.3",
"strum",
"strum_macros",
"sys-locale",
"thiserror",
"typetag",

View File

@ -16,13 +16,7 @@ impl Command for SortBy {
fn signature(&self) -> nu_protocol::Signature {
Signature::build("sort-by")
.input_output_types(vec![
(Type::Table(vec![]), Type::Table(vec![])),
(
Type::List(Box::new(Type::Any)),
Type::List(Box::new(Type::Any)),
),
])
.input_output_types(vec![(Type::Table(vec![]), Type::Table(vec![]))])
.rest("columns", SyntaxShape::Any, "the column(s) to sort by")
.switch("reverse", "Sort in reverse order", Some('r'))
.switch(

View File

@ -16,11 +16,7 @@ impl Command for Seq {
fn signature(&self) -> Signature {
Signature::build("seq")
.input_output_types(vec![
(Type::Nothing, Type::List(Box::new(Type::Number))),
// -s flag
(Type::Nothing, Type::String),
])
.input_output_types(vec![(Type::Nothing, Type::List(Box::new(Type::Number)))])
.rest("rest", SyntaxShape::Number, "sequence values")
.category(Category::Generators)
}
@ -83,7 +79,7 @@ impl Command for Seq {
Example {
description: "sequence 1 to 5, then convert to a string with a pipe separator",
example: "seq 1 5 | str join '|'",
result: Some(Value::test_string("1|2|3|4|5")),
result: None,
},
]
}