From 9cb00518e5bafe50fdd14ec92ca9bec95a36e2f7 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Mon, 19 Jun 2023 13:16:07 -0400 Subject: [PATCH] Update snapshot tests --- parser/src/function.rs | 1 + parser/src/parser.rs | 4 +- ...unction__tests__function_kw_only_args.snap | 2 +- ...__function_kw_only_args_with_defaults.snap | 2 +- ...__tests__function_no_args_with_ranges.snap | 2 - ..._tests__function_pos_and_kw_only_args.snap | 2 +- ...on_pos_and_kw_only_args_with_defaults.snap | 2 +- ...w_only_args_with_defaults_and_varargs.snap | 2 +- ..._with_defaults_and_varargs_and_kwargs.snap | 2 +- ...r__function__tests__function_pos_args.snap | 2 +- ...ests__function_pos_args_with_defaults.snap | 2 +- ..._tests__function_pos_args_with_ranges.snap | 50 +++++++++++-------- ...rser__parser__tests__decorator_ranges.snap | 44 +++++++++------- ...on_parser__parser__tests__parse_class.snap | 6 +-- ...ser__parser__tests__variadic_generics.snap | 2 +- 15 files changed, 70 insertions(+), 55 deletions(-) diff --git a/parser/src/function.rs b/parser/src/function.rs index 2fe262bbb9..53ca0879cb 100644 --- a/parser/src/function.rs +++ b/parser/src/function.rs @@ -136,6 +136,7 @@ mod tests { use super::*; use crate::{ast, parser::ParseErrorType, Parse}; + #[cfg(feature = "all-nodes-with-ranges")] macro_rules! function_and_lambda { ($($name:ident: $code:expr,)*) => { $( diff --git a/parser/src/parser.rs b/parser/src/parser.rs index 99c5d43eb0..95e740cb63 100644 --- a/parser/src/parser.rs +++ b/parser/src/parser.rs @@ -1114,10 +1114,10 @@ def test(): class Abcd: pass "# - .trim(), + .trim(), "", ) - .unwrap(); + .unwrap(); insta::assert_debug_snapshot!(parse_ast); } } diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args.snap index d13ceb57ad..4c1636507c 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args.snap @@ -11,7 +11,7 @@ Ok( "f", ), args: Arguments { - range: 6..16, + range: 5..17, posonlyargs: [], args: [], vararg: None, diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap index a228709a57..5cffd8094d 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_kw_only_args_with_defaults.snap @@ -11,7 +11,7 @@ Ok( "f", ), args: Arguments { - range: 6..22, + range: 5..23, posonlyargs: [], args: [], vararg: None, diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_no_args_with_ranges.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_no_args_with_ranges.snap index d1bab55ee3..fa56b395e0 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_no_args_with_ranges.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_no_args_with_ranges.snap @@ -16,9 +16,7 @@ Ok( args: [], vararg: None, kwonlyargs: [], - kw_defaults: [], kwarg: None, - defaults: [], }, body: [ Pass( diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args.snap index 9ca2f2a536..fecef96c19 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args.snap @@ -11,7 +11,7 @@ Ok( "f", ), args: Arguments { - range: 6..25, + range: 5..26, posonlyargs: [], args: [ ArgWithDefault { diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap index af889e4df2..cb5915cb4c 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults.snap @@ -11,7 +11,7 @@ Ok( "f", ), args: Arguments { - range: 6..31, + range: 5..32, posonlyargs: [], args: [ ArgWithDefault { diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap index ae32c6559a..6c1203e819 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs.snap @@ -11,7 +11,7 @@ Ok( "f", ), args: Arguments { - range: 6..35, + range: 5..36, posonlyargs: [], args: [ ArgWithDefault { diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap index 213589fab0..653b82adb1 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_and_kw_only_args_with_defaults_and_varargs_and_kwargs.snap @@ -11,7 +11,7 @@ Ok( "f", ), args: Arguments { - range: 6..45, + range: 5..46, posonlyargs: [], args: [ ArgWithDefault { diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args.snap index e5515e2a2d..15e9d921ef 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args.snap @@ -11,7 +11,7 @@ Ok( "f", ), args: Arguments { - range: 6..13, + range: 5..14, posonlyargs: [], args: [ ArgWithDefault { diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap index 0c91d69e45..2be9059fc6 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_defaults.snap @@ -11,7 +11,7 @@ Ok( "f", ), args: Arguments { - range: 6..19, + range: 5..20, posonlyargs: [], args: [ ArgWithDefault { diff --git a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_ranges.snap b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_ranges.snap index f1de4fda5f..15e9d921ef 100644 --- a/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_ranges.snap +++ b/parser/src/snapshots/rustpython_parser__function__tests__function_pos_args_with_ranges.snap @@ -14,36 +14,46 @@ Ok( range: 5..14, posonlyargs: [], args: [ - Arg { + ArgWithDefault { range: 6..7, - arg: Identifier( - "a", - ), - annotation: None, - type_comment: None, + def: Arg { + range: 6..7, + arg: Identifier( + "a", + ), + annotation: None, + type_comment: None, + }, + default: None, }, - Arg { + ArgWithDefault { range: 9..10, - arg: Identifier( - "b", - ), - annotation: None, - type_comment: None, + def: Arg { + range: 9..10, + arg: Identifier( + "b", + ), + annotation: None, + type_comment: None, + }, + default: None, }, - Arg { + ArgWithDefault { range: 12..13, - arg: Identifier( - "c", - ), - annotation: None, - type_comment: None, + def: Arg { + range: 12..13, + arg: Identifier( + "c", + ), + annotation: None, + type_comment: None, + }, + default: None, }, ], vararg: None, kwonlyargs: [], - kw_defaults: [], kwarg: None, - defaults: [], }, body: [ Pass( diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__decorator_ranges.snap b/parser/src/snapshots/rustpython_parser__parser__tests__decorator_ranges.snap index b7484bdf16..da39453c50 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__decorator_ranges.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__decorator_ranges.snap @@ -10,7 +10,7 @@ expression: parse_ast "test", ), args: Arguments { - range: (), + range: 22..24, posonlyargs: [], args: [], vararg: None, @@ -25,15 +25,18 @@ expression: parse_ast ), ], decorator_list: [ - Name( - ExprName { - range: 1..13, - id: Identifier( - "my_decorator", - ), - ctx: Load, - }, - ), + Decorator { + range: 0..13, + expression: Name( + ExprName { + range: 1..13, + id: Identifier( + "my_decorator", + ), + ctx: Load, + }, + ), + }, ], returns: None, type_comment: None, @@ -55,15 +58,18 @@ expression: parse_ast ), ], decorator_list: [ - Name( - ExprName { - range: 37..52, - id: Identifier( - "class_decorator", - ), - ctx: Load, - }, - ), + Decorator { + range: 36..52, + expression: Name( + ExprName { + range: 37..52, + id: Identifier( + "class_decorator", + ), + ctx: Load, + }, + ), + }, ], }, ), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap index c27d250f84..69ae0f5e2c 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_class.snap @@ -1,6 +1,6 @@ --- source: parser/src/parser.rs -expression: "parse_program(source, \"\").unwrap()" +expression: "ast::Suite::parse(source, \"\").unwrap()" --- [ ClassDef( @@ -38,7 +38,7 @@ expression: "parse_program(source, \"\").unwrap()" "__init__", ), args: Arguments { - range: 31..35, + range: 30..36, posonlyargs: [], args: [ ArgWithDefault { @@ -77,7 +77,7 @@ expression: "parse_program(source, \"\").unwrap()" "method_with_default", ), args: Arguments { - range: 70..89, + range: 69..90, posonlyargs: [], args: [ ArgWithDefault { diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap b/parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap index 8590915a2d..76c481a083 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__variadic_generics.snap @@ -10,7 +10,7 @@ expression: parse_ast "args_to_tuple", ), args: Arguments { - range: 19..29, + range: 18..30, posonlyargs: [], args: [], vararg: Some(