Skip to content

Commit 47a8b0d

Browse files
youknowdotyouknowdot
committed
Use Python 3.15 parameter diagnostic wording
Update parameter terminology and repeated-star wording without changing parameter parsing or recovered syntax. Regenerate affected snapshots. Assisted-by: OpenAI Codex:model-version-unavailable
1 parent e72c105 commit 47a8b0d

13 files changed

Lines changed: 29 additions & 31 deletions

‎crates/ruff_python_parser/src/error.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -609,22 +609,22 @@ impl std::fmt::Display for ParseErrorType {
609609
}
610610
ParseErrorType::EmptyTypeParams => f.write_str("Type parameter list cannot be empty"),
611611
ParseErrorType::ParamAfterVarKeywordParam => {
612-
f.write_str("arguments cannot follow var-keyword argument")
612+
f.write_str("parameters cannot follow var-keyword parameter")
613613
}
614614
ParseErrorType::NonDefaultParamAfterDefaultParam => {
615615
f.write_str("parameter without a default follows parameter with a default")
616616
}
617617
ParseErrorType::ExpectedKeywordParam => {
618-
f.write_str("named arguments must follow bare *")
618+
f.write_str("named parameters must follow bare *")
619619
}
620620
ParseErrorType::VarKeywordParameterWithDefault => {
621-
f.write_str("var-keyword argument cannot have default value")
621+
f.write_str("var-keyword parameter cannot have default value")
622622
}
623623
ParseErrorType::ExpectedColonAfterDictionaryKey => {
624624
f.write_str("':' expected after dictionary key")
625625
}
626626
ParseErrorType::VarParameterWithDefault => {
627-
f.write_str("var-positional argument cannot have default value")
627+
f.write_str("var-positional parameter cannot have default value")
628628
}
629629
ParseErrorType::InvalidStarPatternUsage => {
630630
f.write_str("cannot use starred expression here")

‎crates/ruff_python_parser/src/parser/statement.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3690,9 +3690,7 @@ impl<'src> Parser<'src> {
36903690
// def foo(a, *args1, *args2, b): ...
36913691
// def foo(a, *args1, b, c, *args2): ...
36923692
parser.add_error(
3693-
ParseErrorType::OtherError(
3694-
"* argument may appear only once".to_string(),
3695-
),
3693+
ParseErrorType::OtherError("* may appear only once".to_string()),
36963694
star_range,
36973695
);
36983696
}
@@ -3712,7 +3710,7 @@ impl<'src> Parser<'src> {
37123710
// def foo(a, *args, *, b): ...
37133711
// def foo(a, *args, b, c, *): ...
37143712
let message = if parser.at(TokenKind::Comma) {
3715-
"* argument may appear only once"
3713+
"* may appear only once"
37163714
} else {
37173715
"invalid syntax"
37183716
};
@@ -3798,7 +3796,7 @@ impl<'src> Parser<'src> {
37983796
// def foo(/, a): ...
37993797
parser.add_error(
38003798
ParseErrorType::OtherError(
3801-
"at least one argument must precede /".to_string(),
3799+
"at least one parameter must precede /".to_string(),
38023800
),
38033801
slash_range,
38043802
);

‎crates/ruff_python_parser/tests/snapshots/invalid_syntax@expressions__lambda_duplicate_parameters.py.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ Module(
364364
7 | lambda a, *a: 1
365365
8 |
366366
9 | lambda a, *, **a: 1
367-
| ^^ Syntax Error: named arguments must follow bare *
367+
| ^^ Syntax Error: named parameters must follow bare *
368368

369369

370370
## Semantic Syntax Errors

‎crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_expected_after_star_separator.py.snap‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ Module(
283283

284284
|
285285
1 | def foo(*): ...
286-
| ^ Syntax Error: named arguments must follow bare *
286+
| ^ Syntax Error: named parameters must follow bare *
287287
2 | def foo(*,): ...
288288
3 | def foo(a, *): ...
289289
|
@@ -292,7 +292,7 @@ Module(
292292
|
293293
1 | def foo(*): ...
294294
2 | def foo(*,): ...
295-
| ^ Syntax Error: named arguments must follow bare *
295+
| ^ Syntax Error: named parameters must follow bare *
296296
3 | def foo(a, *): ...
297297
4 | def foo(a, *,): ...
298298
|
@@ -302,7 +302,7 @@ Module(
302302
1 | def foo(*): ...
303303
2 | def foo(*,): ...
304304
3 | def foo(a, *): ...
305-
| ^ Syntax Error: named arguments must follow bare *
305+
| ^ Syntax Error: named parameters must follow bare *
306306
4 | def foo(a, *,): ...
307307
5 | def foo(*, **kwargs): ...
308308
|
@@ -312,7 +312,7 @@ Module(
312312
2 | def foo(*,): ...
313313
3 | def foo(a, *): ...
314314
4 | def foo(a, *,): ...
315-
| ^ Syntax Error: named arguments must follow bare *
315+
| ^ Syntax Error: named parameters must follow bare *
316316
5 | def foo(*, **kwargs): ...
317317
|
318318

@@ -321,4 +321,4 @@ Module(
321321
3 | def foo(a, *): ...
322322
4 | def foo(a, *,): ...
323323
5 | def foo(*, **kwargs): ...
324-
| ^ Syntax Error: named arguments must follow bare *
324+
| ^ Syntax Error: named parameters must follow bare *

‎crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_follows_var_keyword_param.py.snap‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,24 +134,24 @@ Module(
134134

135135
|
136136
1 | def foo(**kwargs, a, /, b=10, *, *args): ...
137-
| ^ Syntax Error: arguments cannot follow var-keyword argument
137+
| ^ Syntax Error: parameters cannot follow var-keyword parameter
138138

139139

140140
|
141141
1 | def foo(**kwargs, a, /, b=10, *, *args): ...
142-
| ^ Syntax Error: arguments cannot follow var-keyword argument
142+
| ^ Syntax Error: parameters cannot follow var-keyword parameter
143143

144144

145145
|
146146
1 | def foo(**kwargs, a, /, b=10, *, *args): ...
147-
| ^ Syntax Error: arguments cannot follow var-keyword argument
147+
| ^ Syntax Error: parameters cannot follow var-keyword parameter
148148

149149

150150
|
151151
1 | def foo(**kwargs, a, /, b=10, *, *args): ...
152-
| ^ Syntax Error: arguments cannot follow var-keyword argument
152+
| ^ Syntax Error: parameters cannot follow var-keyword parameter
153153

154154

155155
|
156156
1 | def foo(**kwargs, a, /, b=10, *, *args): ...
157-
| ^ Syntax Error: arguments cannot follow var-keyword argument
157+
| ^ Syntax Error: parameters cannot follow var-keyword parameter

‎crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_kwarg_after_star_separator.py.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ Module(
7575

7676
|
7777
1 | def foo(*, **kwargs): ...
78-
| ^ Syntax Error: named arguments must follow bare *
78+
| ^ Syntax Error: named parameters must follow bare *

‎crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_kwargs.py.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ Module(
9393

9494
|
9595
1 | def foo(a, **kwargs1, **kwargs2): ...
96-
| ^^ Syntax Error: arguments cannot follow var-keyword argument
96+
| ^^ Syntax Error: parameters cannot follow var-keyword parameter

‎crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_star_separator.py.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Module(
194194

195195
|
196196
1 | def foo(a, *, *, b): ...
197-
| ^ Syntax Error: * argument may appear only once
197+
| ^ Syntax Error: * may appear only once
198198
2 | def foo(a, *, b, c, *): ...
199199
|
200200

‎crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_multiple_varargs.py.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ Module(
312312

313313
|
314314
1 | def foo(a, *, *args, b): ...
315-
| ^ Syntax Error: * argument may appear only once
315+
| ^ Syntax Error: * may appear only once
316316
2 | # def foo(a, *, b, c, *args): ...
317317
3 | def foo(a, *args1, *args2, b): ...
318318
|
@@ -322,7 +322,7 @@ Module(
322322
1 | def foo(a, *, *args, b): ...
323323
2 | # def foo(a, *, b, c, *args): ...
324324
3 | def foo(a, *args1, *args2, b): ...
325-
| ^ Syntax Error: * argument may appear only once
325+
| ^ Syntax Error: * may appear only once
326326
4 | def foo(a, *args1, b, c, *args2): ...
327327
|
328328

@@ -331,4 +331,4 @@ Module(
331331
2 | # def foo(a, *, b, c, *args): ...
332332
3 | def foo(a, *args1, *args2, b): ...
333333
4 | def foo(a, *args1, b, c, *args2): ...
334-
| ^ Syntax Error: * argument may appear only once
334+
| ^ Syntax Error: * may appear only once

‎crates/ruff_python_parser/tests/snapshots/invalid_syntax@params_no_arg_before_slash.py.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@ Module(
123123

124124
|
125125
1 | def foo(/): ...
126-
| ^ Syntax Error: at least one argument must precede /
126+
| ^ Syntax Error: at least one parameter must precede /
127127
2 | def foo(/, a): ...
128128
|
129129

130130

131131
|
132132
1 | def foo(/): ...
133133
2 | def foo(/, a): ...
134-
| ^ Syntax Error: at least one argument must precede /
134+
| ^ Syntax Error: at least one parameter must precede /

0 commit comments

Comments
 (0)