Commitbdb9c1d

authored

Merge pull requestRustPython#4382 from anilbey/duplicate-keyword-arg

arg name to be written upon duplicate kwargs errorRustPython#4381

2 parents3a5716d +b76441b commitbdb9c1dCopy full SHA for bdb9c1d

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ pub enum LexicalErrorType {`
`24`	`24`	`DuplicateArgumentError(String),`
`25`	`25`	`PositionalArgumentError,`
`26`	`26`	`UnpackedArgumentError,`
`27`		`-DuplicateKeywordArgumentError,`
	`27`	`+DuplicateKeywordArgumentError(String),`
`28`	`28`	`UnrecognizedToken{tok:char},`
`29`	`29`	`FStringError(FStringErrorType),`
`30`	`30`	`LineContinuationError,`
`@@ -54,8 +54,8 @@ impl fmt::Display for LexicalErrorType {`
`54`	`54`	`LexicalErrorType::DuplicateArgumentError(arg_name) =>{`
`55`	`55`	`write!(f,"duplicate argument '{arg_name}' in function definition")`
`56`	`56`	`}`
`57`		`-LexicalErrorType::DuplicateKeywordArgumentError =>{`
`58`		`-write!(f,"keyword argument repeated")`
	`57`	`+LexicalErrorType::DuplicateKeywordArgumentError(arg_name) =>{`
	`58`	`+write!(f,"keyword argument repeated: {arg_name}")`
`59`	`59`	`}`
`60`	`60`	`LexicalErrorType::PositionalArgumentError =>{`
`61`	`61`	`write!(f,"positional argument follows keyword argument")`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,9 @@ pub fn parse_args(func_args: Vec<FunctionArgument>) -> Result<ArgumentList, Lexi`
`92`	`92`	`ifletSome(keyword_name) =&name{`
`93`	`93`	`if keyword_names.contains(keyword_name){`
`94`	`94`	`returnErr(LexicalError{`
`95`		`-error:LexicalErrorType::DuplicateKeywordArgumentError,`
	`95`	`+error:LexicalErrorType::DuplicateKeywordArgumentError(`
	`96`	`+ keyword_name.to_string(),`
	`97`	`+),`
`96`	`98`	`location: start,`
`97`	`99`	`});`
`98`	`100`	`}`

Comments

(0)