diff --git a/lib/src/fileset_parser.rs b/lib/src/fileset_parser.rs index 80b37d2a7..f1ecae9f7 100644 --- a/lib/src/fileset_parser.rs +++ b/lib/src/fileset_parser.rs @@ -122,16 +122,13 @@ impl FilesetParseError { } /// Unexpected number of arguments, or invalid combination of arguments. - pub(super) fn invalid_arguments( - function: &FunctionCallNode, - message: impl Into, - ) -> Self { + pub(super) fn invalid_arguments(name: &str, message: String, span: pest::Span<'_>) -> Self { FilesetParseError::new( FilesetParseErrorKind::InvalidArguments { - name: function.name.to_owned(), - message: message.into(), + name: name.to_owned(), + message, }, - function.args_span, + span, ) } @@ -347,12 +344,13 @@ impl<'i> FunctionCallNode<'i> { if self.args.is_empty() { Ok(()) } else { - Err(FilesetParseError::invalid_arguments( - self, - "Expected 0 arguments", - )) + Err(self.invalid_arguments("Expected 0 arguments".to_owned())) } } + + fn invalid_arguments(&self, message: String) -> FilesetParseError { + FilesetParseError::invalid_arguments(self.name, message, self.args_span) + } } #[cfg(test)]