From aed8d3800bb0611a746f420fe23a25c81c98a8b9 Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Wed, 9 Nov 2022 15:24:57 -0800
Subject: [PATCH] Fix CI failures after PR merge conflicts (#7072)

---
 Cargo.lock                               | 4 ++--
 crates/nu-command/src/filters/sort_by.rs | 8 +-------
 crates/nu-command/src/generators/seq.rs  | 8 ++------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ba2a4e7ad5..07cfb38966 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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",
diff --git a/crates/nu-command/src/filters/sort_by.rs b/crates/nu-command/src/filters/sort_by.rs
index 0f46b8b0dc..61f9217bb3 100644
--- a/crates/nu-command/src/filters/sort_by.rs
+++ b/crates/nu-command/src/filters/sort_by.rs
@@ -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(
diff --git a/crates/nu-command/src/generators/seq.rs b/crates/nu-command/src/generators/seq.rs
index 796b16b8fe..2d605273e4 100644
--- a/crates/nu-command/src/generators/seq.rs
+++ b/crates/nu-command/src/generators/seq.rs
@@ -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,
             },
         ]
     }