Remove old nushell/merge engine-q

crates/nu-protocol/src/syntax_shape.rs

@@ -1,65 +1,3 @@
-<<<<<<< HEAD
-use nu_source::{DbgDocBldr, DebugDocBuilder, PrettyDebug};
-use serde::{Deserialize, Serialize};
-
-/// The syntactic shapes that values must match to be passed into a command. You can think of this as the type-checking that occurs when you call a function.
-#[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
-pub enum SyntaxShape {
-    /// Any syntactic form is allowed
-    Any,
-    /// Strings and string-like bare words are allowed
-    String,
-    /// A dotted path to navigate the table
-    ColumnPath,
-    /// A dotted path to navigate the table (including variable)
-    FullColumnPath,
-    /// Only a numeric (integer or decimal) value is allowed
-    Number,
-    /// A range is allowed (eg, `1..3`)
-    Range,
-    /// Only an integer value is allowed
-    Int,
-    /// A filepath is allowed
-    FilePath,
-    /// A glob pattern is allowed, eg `foo*`
-    GlobPattern,
-    /// A block is allowed, eg `{start this thing}`
-    Block,
-    /// A table is allowed, eg `[first second]`
-    Table,
-    /// A filesize value is allowed, eg `10kb`
-    Filesize,
-    /// A duration value is allowed, eg `19day`
-    Duration,
-    /// An operator
-    Operator,
-    /// A math expression which expands shorthand forms on the lefthand side, eg `foo > 1`
-    /// The shorthand allows us to more easily reach columns inside of the row being passed in
-    RowCondition,
-    /// A general math expression, eg the `1 + 2` of `= 1 + 2`
-    MathExpression,
-}
-
-impl SyntaxShape {
-    pub fn syntax_shape_name(&self) -> &str {
-        match self {
-            SyntaxShape::Any => "any",
-            SyntaxShape::String => "string",
-            SyntaxShape::FullColumnPath => "column path (with variable)",
-            SyntaxShape::ColumnPath => "column path",
-            SyntaxShape::Number => "number",
-            SyntaxShape::Range => "range",
-            SyntaxShape::Int => "integer",
-            SyntaxShape::FilePath => "file path",
-            SyntaxShape::GlobPattern => "pattern",
-            SyntaxShape::Block => "block",
-            SyntaxShape::Table => "table",
-            SyntaxShape::Duration => "duration",
-            SyntaxShape::Filesize => "filesize",
-            SyntaxShape::Operator => "operator",
-            SyntaxShape::RowCondition => "condition",
-            SyntaxShape::MathExpression => "math expression",
-=======
 use std::fmt::Display;
 
 use serde::{Deserialize, Serialize};
@@ -181,17 +119,10 @@ impl SyntaxShape {
             SyntaxShape::Table => Type::List(Box::new(Type::Unknown)), // FIXME: Tables should have better types
             SyntaxShape::VarWithOptType => Type::Unknown,
             SyntaxShape::Variable => Type::Unknown,
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
         }
     }
 }
 
-<<<<<<< HEAD
-impl PrettyDebug for SyntaxShape {
-    /// Prepare SyntaxShape for pretty-printing
-    fn pretty(&self) -> DebugDocBuilder {
-        DbgDocBldr::kind(self.syntax_shape_name().to_string())
-=======
 impl Display for SyntaxShape {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
@@ -224,6 +155,5 @@ impl Display for SyntaxShape {
             SyntaxShape::Boolean => write!(f, "bool"),
             SyntaxShape::Custom(x, _) => write!(f, "custom<{}>", x),
         }
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
     }
 }