Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-26 21:13:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix CI failures after PR merge conflicts (#7072)

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

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

8
crates/nu-command/src/filters/sort_by.rs
View file

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

8
crates/nu-command/src/generators/seq.rs
View file

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