Skip to content

Commit

Permalink
Remove unused SyntaxShape::Variable (nushell#10511)
Browse files Browse the repository at this point in the history
# Description
We don't use this shape during parsing and never reference it in command
signatures. Thus it should be removed.

# User-Facing Changes
None functional.
Plugin authors that used it would never be provided with data that
specifically matched `SyntaxShape::Variable`
Builds using it will now fail.

# Tests + Formatting
NA
  • Loading branch information
sholderbach authored Sep 28, 2023
1 parent cc76746 commit d1dc610
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
1 change: 0 additions & 1 deletion crates/nu-parser/src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2743,7 +2743,6 @@ pub fn parse_shape_name(
b"signature" => SyntaxShape::Signature,
b"string" => SyntaxShape::String,
_ if bytes.starts_with(b"table") => parse_collection_shape(working_set, bytes, span),
b"variable" => SyntaxShape::Variable,
b"var-with-opt-type" => SyntaxShape::VarWithOptType,
_ => {
if bytes.contains(&b'@') {
Expand Down
5 changes: 0 additions & 5 deletions crates/nu-protocol/src/syntax_shape.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ pub enum SyntaxShape {
/// A table is allowed, eg `[[first, second]; [1, 2]]`
Table(Vec<(String, SyntaxShape)>),

/// A variable name, eg `$foo`
Variable,

/// A variable with optional type, `x` or `x: int`
VarWithOptType,
}
Expand Down Expand Up @@ -164,7 +161,6 @@ impl SyntaxShape {
SyntaxShape::String => Type::String,
SyntaxShape::Table(columns) => Type::Table(mk_ty(columns)),
SyntaxShape::VarWithOptType => Type::Any,
SyntaxShape::Variable => Type::Any,
}
}
}
Expand Down Expand Up @@ -226,7 +222,6 @@ impl Display for SyntaxShape {
SyntaxShape::Operator => write!(f, "operator"),
SyntaxShape::RowCondition => write!(f, "condition"),
SyntaxShape::MathExpression => write!(f, "variable"),
SyntaxShape::Variable => write!(f, "var"),
SyntaxShape::VarWithOptType => write!(f, "vardecl"),
SyntaxShape::Signature => write!(f, "signature"),
SyntaxShape::MatchPattern => write!(f, "match-pattern"),
Expand Down

0 comments on commit d1dc610

Please sign in to comment.