diff --git a/ast/asdl_rs.py b/ast/asdl_rs.py index f06170551e257..06ee2e571e868 100755 --- a/ast/asdl_rs.py +++ b/ast/asdl_rs.py @@ -449,7 +449,7 @@ def gen_classdef(self, name, fields, attrs, depth, base="AstNode"): f"ctx.new_str(ascii!({json.dumps(f.name)})).into()" for f in fields ) self.emit( - f"class.set_attr(identifier!(ctx, _fields), ctx.new_list(vec![{fields}]).into());", + f"class.set_attr(identifier!(ctx, _fields), ctx.new_tuple(vec![{fields}]).into());", depth + 2, ) attrs = ",".join( diff --git a/core/src/location.rs b/core/src/location.rs index 73d6ec89d22cb..c4b7aa1fa95cd 100644 --- a/core/src/location.rs +++ b/core/src/location.rs @@ -43,7 +43,7 @@ impl Location { pub fn reset(&mut self) { self.row = 1; - self.column = 1; + self.column = 0; } pub fn go_right(&mut self) { diff --git a/parser/src/parser.rs b/parser/src/parser.rs index 90903cf2484eb..9bab28cf2c9d0 100644 --- a/parser/src/parser.rs +++ b/parser/src/parser.rs @@ -35,13 +35,13 @@ pub fn parse_program(source: &str, source_path: &str) -> Result Result\").unwrap()" Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { @@ -21,12 +21,12 @@ expression: "parse_program(source, \"\").unwrap()" Located { location: Location { row: 1, - column: 11, + column: 10, }, end_location: Some( Location { row: 1, - column: 12, + column: 11, }, ), custom: (), @@ -38,12 +38,12 @@ expression: "parse_program(source, \"\").unwrap()" Located { location: Location { row: 1, - column: 14, + column: 13, }, end_location: Some( Location { row: 1, - column: 15, + column: 14, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_dict_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_dict_comprehension.snap index 7d5a69fa333da..2c0bc513ba45b 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_dict_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_dict_comprehension.snap @@ -5,12 +5,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 20, + column: 19, }, ), custom: (), @@ -18,12 +18,12 @@ Located { key: Located { location: Location { row: 1, - column: 2, + column: 1, }, end_location: Some( Location { row: 1, - column: 4, + column: 3, }, ), custom: (), @@ -35,12 +35,12 @@ Located { value: Located { location: Location { row: 1, - column: 6, + column: 5, }, end_location: Some( Location { row: 1, - column: 8, + column: 7, }, ), custom: (), @@ -54,12 +54,12 @@ Located { target: Located { location: Location { row: 1, - column: 13, + column: 12, }, end_location: Some( Location { row: 1, - column: 14, + column: 13, }, ), custom: (), @@ -71,12 +71,12 @@ Located { iter: Located { location: Location { row: 1, - column: 18, + column: 17, }, end_location: Some( Location { row: 1, - column: 19, + column: 18, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_double_list_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_double_list_comprehension.snap index 9cc392c8f084e..6b04ccd92e60e 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_double_list_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_double_list_comprehension.snap @@ -5,12 +5,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 49, + column: 48, }, ), custom: (), @@ -18,12 +18,12 @@ Located { elt: Located { location: Location { row: 1, - column: 2, + column: 1, }, end_location: Some( Location { row: 1, - column: 3, + column: 2, }, ), custom: (), @@ -37,12 +37,12 @@ Located { target: Located { location: Location { row: 1, - column: 8, + column: 7, }, end_location: Some( Location { row: 1, - column: 13, + column: 12, }, ), custom: (), @@ -51,12 +51,12 @@ Located { Located { location: Location { row: 1, - column: 8, + column: 7, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), @@ -68,12 +68,12 @@ Located { Located { location: Location { row: 1, - column: 11, + column: 10, }, end_location: Some( Location { row: 1, - column: 13, + column: 12, }, ), custom: (), @@ -89,12 +89,12 @@ Located { iter: Located { location: Location { row: 1, - column: 17, + column: 16, }, end_location: Some( Location { row: 1, - column: 18, + column: 17, }, ), custom: (), @@ -110,12 +110,12 @@ Located { target: Located { location: Location { row: 1, - column: 23, + column: 22, }, end_location: Some( Location { row: 1, - column: 24, + column: 23, }, ), custom: (), @@ -127,12 +127,12 @@ Located { iter: Located { location: Location { row: 1, - column: 28, + column: 27, }, end_location: Some( Location { row: 1, - column: 29, + column: 28, }, ), custom: (), @@ -145,12 +145,12 @@ Located { Located { location: Location { row: 1, - column: 35, + column: 34, }, end_location: Some( Location { row: 1, - column: 38, + column: 37, }, ), custom: (), @@ -158,12 +158,12 @@ Located { left: Located { location: Location { row: 1, - column: 33, + column: 32, }, end_location: Some( Location { row: 1, - column: 34, + column: 33, }, ), custom: (), @@ -179,12 +179,12 @@ Located { Located { location: Location { row: 1, - column: 37, + column: 36, }, end_location: Some( Location { row: 1, - column: 38, + column: 37, }, ), custom: (), @@ -201,12 +201,12 @@ Located { Located { location: Location { row: 1, - column: 44, + column: 43, }, end_location: Some( Location { row: 1, - column: 48, + column: 47, }, ), custom: (), @@ -214,12 +214,12 @@ Located { left: Located { location: Location { row: 1, - column: 42, + column: 41, }, end_location: Some( Location { row: 1, - column: 43, + column: 42, }, ), custom: (), @@ -235,12 +235,12 @@ Located { Located { location: Location { row: 1, - column: 46, + column: 45, }, end_location: Some( Location { row: 1, - column: 48, + column: 47, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap index 13c2fc69611f2..14009d328cab4 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_f_string.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 15, + column: 14, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 15, + column: 14, }, ), custom: (), @@ -33,12 +33,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 15, + column: 14, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_generator_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_generator_comprehension.snap index 1ceab19616906..89e05b2838682 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_generator_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_generator_comprehension.snap @@ -5,12 +5,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 15, + column: 14, }, ), custom: (), @@ -18,12 +18,12 @@ Located { elt: Located { location: Location { row: 1, - column: 2, + column: 1, }, end_location: Some( Location { row: 1, - column: 3, + column: 2, }, ), custom: (), @@ -37,12 +37,12 @@ Located { target: Located { location: Location { row: 1, - column: 8, + column: 7, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), @@ -54,12 +54,12 @@ Located { iter: Located { location: Location { row: 1, - column: 13, + column: 12, }, end_location: Some( Location { row: 1, - column: 14, + column: 13, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_elif_else.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_elif_else.snap index c628cf98cdebf..9553a379620e4 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_elif_else.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_elif_else.snap @@ -6,7 +6,7 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { @@ -19,12 +19,12 @@ expression: parse_ast test: Located { location: Location { row: 1, - column: 4, + column: 3, }, end_location: Some( Location { row: 1, - column: 5, + column: 4, }, ), custom: (), @@ -39,12 +39,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 7, + column: 6, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), @@ -52,12 +52,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 7, + column: 6, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_else_generator_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_else_generator_comprehension.snap index 6f8b7c27fe74d..d9762f531375b 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_else_generator_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_if_else_generator_comprehension.snap @@ -5,12 +5,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 27, + column: 26, }, ), custom: (), @@ -18,12 +18,12 @@ Located { elt: Located { location: Location { row: 1, - column: 4, + column: 3, }, end_location: Some( Location { row: 1, - column: 15, + column: 14, }, ), custom: (), @@ -31,12 +31,12 @@ Located { test: Located { location: Location { row: 1, - column: 7, + column: 6, }, end_location: Some( Location { row: 1, - column: 8, + column: 7, }, ), custom: (), @@ -48,12 +48,12 @@ Located { body: Located { location: Location { row: 1, - column: 2, + column: 1, }, end_location: Some( Location { row: 1, - column: 3, + column: 2, }, ), custom: (), @@ -65,12 +65,12 @@ Located { orelse: Located { location: Location { row: 1, - column: 14, + column: 13, }, end_location: Some( Location { row: 1, - column: 15, + column: 14, }, ), custom: (), @@ -86,12 +86,12 @@ Located { target: Located { location: Location { row: 1, - column: 20, + column: 19, }, end_location: Some( Location { row: 1, - column: 21, + column: 20, }, ), custom: (), @@ -103,12 +103,12 @@ Located { iter: Located { location: Location { row: 1, - column: 25, + column: 24, }, end_location: Some( Location { row: 1, - column: 26, + column: 25, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap index 61d45da804209..dfe985973161d 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_kwargs.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 33, + column: 32, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 33, + column: 32, }, ), custom: (), @@ -32,12 +32,12 @@ expression: parse_ast func: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 8, + column: 7, }, ), custom: (), @@ -50,12 +50,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 9, + column: 8, }, end_location: Some( Location { row: 1, - column: 21, + column: 20, }, ), custom: (), @@ -71,12 +71,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 23, + column: 22, }, end_location: Some( Location { row: 1, - column: 32, + column: 31, }, ), custom: (), @@ -87,12 +87,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 31, + column: 30, }, end_location: Some( Location { row: 1, - column: 32, + column: 31, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap index 7e0395a40862d..f305878e4647d 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_lambda.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 19, + column: 18, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 19, + column: 18, }, ), custom: (), @@ -35,12 +35,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 8, + column: 7, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), @@ -53,12 +53,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 11, + column: 10, }, end_location: Some( Location { row: 1, - column: 12, + column: 11, }, ), custom: (), @@ -78,12 +78,12 @@ expression: parse_ast body: Located { location: Location { row: 1, - column: 16, + column: 15, }, end_location: Some( Location { row: 1, - column: 19, + column: 18, }, ), custom: (), @@ -91,12 +91,12 @@ expression: parse_ast left: Located { location: Location { row: 1, - column: 14, + column: 13, }, end_location: Some( Location { row: 1, - column: 15, + column: 14, }, ), custom: (), @@ -109,12 +109,12 @@ expression: parse_ast right: Located { location: Location { row: 1, - column: 18, + column: 17, }, end_location: Some( Location { row: 1, - column: 19, + column: 18, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_list_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_list_comprehension.snap index f932e7db26f9b..9af8e55ea3c81 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_list_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_list_comprehension.snap @@ -5,12 +5,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 15, + column: 14, }, ), custom: (), @@ -18,12 +18,12 @@ Located { elt: Located { location: Location { row: 1, - column: 2, + column: 1, }, end_location: Some( Location { row: 1, - column: 3, + column: 2, }, ), custom: (), @@ -37,12 +37,12 @@ Located { target: Located { location: Location { row: 1, - column: 8, + column: 7, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), @@ -54,12 +54,12 @@ Located { iter: Located { location: Location { row: 1, - column: 13, + column: 12, }, end_location: Some( Location { row: 1, - column: 14, + column: 13, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_named_expression_generator_comprehension.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_named_expression_generator_comprehension.snap index 2f534dd85872b..d291cd5522327 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_named_expression_generator_comprehension.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_named_expression_generator_comprehension.snap @@ -5,12 +5,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 24, + column: 23, }, ), custom: (), @@ -18,12 +18,12 @@ Located { elt: Located { location: Location { row: 1, - column: 2, + column: 1, }, end_location: Some( Location { row: 1, - column: 12, + column: 11, }, ), custom: (), @@ -31,12 +31,12 @@ Located { target: Located { location: Location { row: 1, - column: 2, + column: 1, }, end_location: Some( Location { row: 1, - column: 12, + column: 11, }, ), custom: (), @@ -48,12 +48,12 @@ Located { value: Located { location: Location { row: 1, - column: 9, + column: 8, }, end_location: Some( Location { row: 1, - column: 12, + column: 11, }, ), custom: (), @@ -61,12 +61,12 @@ Located { left: Located { location: Location { row: 1, - column: 7, + column: 6, }, end_location: Some( Location { row: 1, - column: 8, + column: 7, }, ), custom: (), @@ -79,12 +79,12 @@ Located { right: Located { location: Location { row: 1, - column: 11, + column: 10, }, end_location: Some( Location { row: 1, - column: 12, + column: 11, }, ), custom: (), @@ -104,12 +104,12 @@ Located { target: Located { location: Location { row: 1, - column: 17, + column: 16, }, end_location: Some( Location { row: 1, - column: 18, + column: 17, }, ), custom: (), @@ -121,12 +121,12 @@ Located { iter: Located { location: Location { row: 1, - column: 22, + column: 21, }, end_location: Some( Location { row: 1, - column: 23, + column: 22, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_2.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_2.snap index fcb2eecc0b882..c782b8a88774a 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_2.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_2.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 24, + column: 23, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 24, + column: 23, }, ), custom: (), @@ -32,12 +32,12 @@ expression: parse_ast func: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 6, + column: 5, }, ), custom: (), @@ -50,12 +50,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 7, + column: 6, }, end_location: Some( Location { row: 1, - column: 20, + column: 19, }, ), custom: (), @@ -69,12 +69,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 22, + column: 21, }, end_location: Some( Location { row: 1, - column: 23, + column: 22, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_hello.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_hello.snap index 49efd4773bfd3..34f6ed85be5ab 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_hello.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_print_hello.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 21, + column: 20, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 21, + column: 20, }, ), custom: (), @@ -32,12 +32,12 @@ expression: parse_ast func: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 6, + column: 5, }, ), custom: (), @@ -50,12 +50,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 7, + column: 6, }, end_location: Some( Location { row: 1, - column: 20, + column: 19, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap index 318a0f9cfc333..d58f9e3a40930 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_string.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 14, + column: 13, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 14, + column: 13, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap b/parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap index c8e252c447cc4..7be862817627c 100644 --- a/parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap +++ b/parser/src/snapshots/rustpython_parser__parser__tests__parse_tuples.snap @@ -6,12 +6,12 @@ expression: "parse_program(source, \"\").unwrap()" Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 12, + column: 11, }, ), custom: (), @@ -20,12 +20,12 @@ expression: "parse_program(source, \"\").unwrap()" Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 5, + column: 4, }, ), custom: (), @@ -34,12 +34,12 @@ expression: "parse_program(source, \"\").unwrap()" Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 2, + column: 1, }, ), custom: (), @@ -51,12 +51,12 @@ expression: "parse_program(source, \"\").unwrap()" Located { location: Location { row: 1, - column: 4, + column: 3, }, end_location: Some( Location { row: 1, - column: 5, + column: 4, }, ), custom: (), @@ -73,12 +73,12 @@ expression: "parse_program(source, \"\").unwrap()" value: Located { location: Location { row: 1, - column: 8, + column: 7, }, end_location: Some( Location { row: 1, - column: 12, + column: 11, }, ), custom: (), @@ -87,12 +87,12 @@ expression: "parse_program(source, \"\").unwrap()" Located { location: Location { row: 1, - column: 8, + column: 7, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), @@ -106,12 +106,12 @@ expression: "parse_program(source, \"\").unwrap()" Located { location: Location { row: 1, - column: 11, + column: 10, }, end_location: Some( Location { row: 1, - column: 12, + column: 11, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap index 3cce5b1d83537..f57f903bc258f 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_1.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 18, + column: 17, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), @@ -33,12 +33,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap index 3cce5b1d83537..f57f903bc258f 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_2.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 18, + column: 17, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), @@ -33,12 +33,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap index 2ab56927fbf40..68582508b039b 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_f_string_concat_3.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 23, + column: 22, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), @@ -33,12 +33,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), @@ -52,12 +52,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 10, + column: 9, }, end_location: Some( Location { row: 1, - column: 23, + column: 22, }, ), custom: (), @@ -65,12 +65,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 2, + column: 1, }, end_location: Some( Location { row: 1, - column: 5, + column: 4, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap index fd88e7b306310..0052f8df6c042 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_string_concat.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 17, + column: 16, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_string_triple_quotes_with_kind.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_string_triple_quotes_with_kind.snap index a08dde8543a3e..0616991c8fd97 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_string_triple_quotes_with_kind.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_string_triple_quotes_with_kind.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 21, + column: 20, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 21, + column: 20, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap index ba2ae385de184..d9d57865edc14 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_1.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 19, + column: 18, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 10, + column: 9, }, ), custom: (), @@ -33,12 +33,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 10, + column: 9, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap index 7d21fea842d0d..a9f10f062ca31 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_f_string_concat_2.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 23, + column: 22, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 10, + column: 9, }, ), custom: (), @@ -33,12 +33,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 10, + column: 9, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap index 9c93348a7f449..503d5b5c1393b 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_1.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 18, + column: 17, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 9, + column: 8, }, ), custom: (), diff --git a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap index 0af6e48f7bf6a..432625993a587 100644 --- a/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap +++ b/parser/src/snapshots/rustpython_parser__string__tests__parse_u_string_concat_2.snap @@ -6,12 +6,12 @@ expression: parse_ast Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 18, + column: 17, }, ), custom: (), @@ -19,12 +19,12 @@ expression: parse_ast value: Located { location: Location { row: 1, - column: 1, + column: 0, }, end_location: Some( Location { row: 1, - column: 10, + column: 9, }, ), custom: (),