extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 22:50:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix ignored clippy lints (#12160)

Browse Source 
# Description
Fixes some ignored clippy lints.

# User-Facing Changes
Changes some signatures and return types to `&dyn Command` instead of
`&Box<dyn Command`, but I believe this is only an internal change.
This commit is contained in:
Ian Manske
2024-03-11 18:46:04 +00:00
committed by GitHub
parent 77379d7b3d
commit 26786a759e
20 changed files with 93 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
crates/nu-parser/src/parser.rs
View File

@ -577,9 +577,8 @@ fn first_kw_idx(
..
}) = signature.get_positional(idx)
{
#[allow(clippy::needless_range_loop)]
for span_idx in spans_idx..spans.len() {
let contents = working_set.get_span_contents(spans[span_idx]);
for (span_idx, &span) in spans.iter().enumerate().skip(spans_idx) {
let contents = working_set.get_span_contents(span);
if contents == kw {
return (Some(idx), span_idx);
@ -3201,12 +3200,11 @@ pub fn parse_signature(working_set: &mut StateWorkingSet, span: Span) -> Express
}
pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) -> Box<Signature> {
#[allow(clippy::enum_variant_names)]
enum ParseMode {
ArgMode,
AfterCommaArgMode,
TypeMode,
DefaultValueMode,
Arg,
AfterCommaArg,
Type,
DefaultValue,
}
#[derive(Debug)]
@ -3237,7 +3235,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
}
let mut args: Vec<Arg> = vec![];
let mut parse_mode = ParseMode::ArgMode;
let mut parse_mode = ParseMode::Arg;
for token in &output {
match token {
@ -3251,13 +3249,13 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
// The : symbol separates types
if contents == b":" {
match parse_mode {
ParseMode::ArgMode => {
parse_mode = ParseMode::TypeMode;
ParseMode::Arg => {
parse_mode = ParseMode::Type;
}
ParseMode::AfterCommaArgMode => {
ParseMode::AfterCommaArg => {
working_set.error(ParseError::Expected("parameter or flag", span));
}
ParseMode::TypeMode | ParseMode::DefaultValueMode => {
ParseMode::Type | ParseMode::DefaultValue => {
// We're seeing two types for the same thing for some reason, error
working_set.error(ParseError::Expected("type", span));
}
@ -3266,13 +3264,13 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
// The = symbol separates a variable from its default value
else if contents == b"=" {
match parse_mode {
ParseMode::TypeMode | ParseMode::ArgMode => {
parse_mode = ParseMode::DefaultValueMode;
ParseMode::Type | ParseMode::Arg => {
parse_mode = ParseMode::DefaultValue;
}
ParseMode::AfterCommaArgMode => {
ParseMode::AfterCommaArg => {
working_set.error(ParseError::Expected("parameter or flag", span));
}
ParseMode::DefaultValueMode => {
ParseMode::DefaultValue => {
// We're seeing two default values for some reason, error
working_set.error(ParseError::Expected("default value", span));
}
@ -3281,20 +3279,20 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
// The , symbol separates params only
else if contents == b"," {
match parse_mode {
ParseMode::ArgMode => parse_mode = ParseMode::AfterCommaArgMode,
ParseMode::AfterCommaArgMode => {
ParseMode::Arg => parse_mode = ParseMode::AfterCommaArg,
ParseMode::AfterCommaArg => {
working_set.error(ParseError::Expected("parameter or flag", span));
}
ParseMode::TypeMode => {
ParseMode::Type => {
working_set.error(ParseError::Expected("type", span));
}
ParseMode::DefaultValueMode => {
ParseMode::DefaultValue => {
working_set.error(ParseError::Expected("default value", span));
}
}
} else {
match parse_mode {
ParseMode::ArgMode | ParseMode::AfterCommaArgMode => {
ParseMode::Arg | ParseMode::AfterCommaArg => {
// Long flag with optional short form following with no whitespace, e.g. --output, --age(-a)
if contents.starts_with(b"--") && contents.len() > 2 {
// Split the long flag from the short flag with the ( character as delimiter.
@ -3400,7 +3398,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
working_set.error(ParseError::Expected("short flag", span));
}
}
parse_mode = ParseMode::ArgMode;
parse_mode = ParseMode::Arg;
}
// Mandatory short flag, e.g. -e (must be one character)
else if contents.starts_with(b"-") && contents.len() > 1 {
@ -3438,12 +3436,12 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
},
type_annotated: false,
});
parse_mode = ParseMode::ArgMode;
parse_mode = ParseMode::Arg;
}
// Short flag alias for long flag, e.g. --b (-a)
// This is the same as the short flag in --b(-a)
else if contents.starts_with(b"(-") {
if matches!(parse_mode, ParseMode::AfterCommaArgMode) {
if matches!(parse_mode, ParseMode::AfterCommaArg) {
working_set
.error(ParseError::Expected("parameter or flag", span));
}
@ -3506,7 +3504,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
required: false,
type_annotated: false,
});
parse_mode = ParseMode::ArgMode;
parse_mode = ParseMode::Arg;
}
// Rest param
else if let Some(contents) = contents.strip_prefix(b"...") {
@ -3530,7 +3528,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
var_id: Some(var_id),
default_value: None,
}));
parse_mode = ParseMode::ArgMode;
parse_mode = ParseMode::Arg;
}
// Normal param
else {
@ -3559,10 +3557,10 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
required: true,
type_annotated: false,
});
parse_mode = ParseMode::ArgMode;
parse_mode = ParseMode::Arg;
}
}
ParseMode::TypeMode => {
ParseMode::Type => {
if let Some(last) = args.last_mut() {
let syntax_shape = parse_shape_name(
working_set,
@ -3604,9 +3602,9 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
}
}
}
parse_mode = ParseMode::ArgMode;
parse_mode = ParseMode::Arg;
}
ParseMode::DefaultValueMode => {
ParseMode::DefaultValue => {
if let Some(last) = args.last_mut() {
let expression = parse_value(working_set, span, &SyntaxShape::Any);
@ -3727,7 +3725,7 @@ pub fn parse_signature_helper(working_set: &mut StateWorkingSet, span: Span) ->
}
}
}
parse_mode = ParseMode::ArgMode;
parse_mode = ParseMode::Arg;
}
}
}