mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-07-18 02:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename JoinedStr to FString in the AST (#6379)

Browse source 
## Summary

Per the proposal in https://github.com/astral-sh/ruff/discussions/6183,
this PR renames the `JoinedStr` node to `FString`.
This commit is contained in:
Charlie Marsh 2023-08-07 13:33:17 -04:00 • committed by GitHub
parent 999d88e773
commit 3f0eea6d87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 166 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__parse_f_string.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..14,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..14,
values: [
Constant(

8
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__try.snap
View file

@ -79,8 +79,8 @@ expression: parse_ast
arguments: Arguments {
range: 61..82,
args: [
JoinedStr(
ExprJoinedStr {
FString(
ExprFString {
range: 62..81,
values: [
Constant(
@ -173,8 +173,8 @@ expression: parse_ast
arguments: Arguments {
range: 113..134,
args: [
JoinedStr(
ExprJoinedStr {
FString(
ExprFString {
range: 114..133,
values: [
Constant(

8
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__try_star.snap
View file

@ -195,8 +195,8 @@ expression: parse_ast
arguments: Arguments {
range: 132..180,
args: [
JoinedStr(
ExprJoinedStr {
FString(
ExprFString {
range: 133..179,
values: [
Constant(
@ -323,8 +323,8 @@ expression: parse_ast
arguments: Arguments {
range: 212..260,
args: [
JoinedStr(
ExprJoinedStr {
FString(
ExprFString {
range: 213..259,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_constant_range.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..22,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..22,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_character.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..8,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..8,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_escaped_newline.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..8,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..8,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_line_continuation.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..9,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..9,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_parse_self_documenting_format.snap
View file

@ -21,8 +21,8 @@ expression: parse_ast
),
conversion: None,
format_spec: Some(
JoinedStr(
ExprJoinedStr {
FString(
ExprFString {
range: 9..12,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__fstring_unescaped_newline.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..11,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..11,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_1.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..17,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..17,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_2.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..17,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..17,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_f_string_concat_3.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..22,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..22,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_nested_spec.snap
View file

@ -16,8 +16,8 @@ expression: parse_ast
debug_text: None,
conversion: None,
format_spec: Some(
JoinedStr(
ExprJoinedStr {
FString(
ExprFString {
range: 7..13,
values: [
FormattedValue(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_fstring_not_nested_spec.snap
View file

@ -16,8 +16,8 @@ expression: parse_ast
debug_text: None,
conversion: None,
format_spec: Some(
JoinedStr(
ExprJoinedStr {
FString(
ExprFString {
range: 7..11,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_1.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..18,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..18,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__parse_u_f_string_concat_2.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..22,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..22,
values: [
Constant(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__raw_fstring.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..7,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..7,
values: [
FormattedValue(

4
crates/ruff_python_parser/src/snapshots/ruff_python_parser__string__tests__triple_quoted_raw_fstring.snap
View file

@ -6,8 +6,8 @@ expression: parse_ast
Expr(
StmtExpr {
range: 0..11,
value: JoinedStr(
ExprJoinedStr {
value: FString(
ExprFString {
range: 0..11,
values: [
FormattedValue(

4
crates/ruff_python_parser/src/string.rs
View file

@ -243,7 +243,7 @@ impl<'a> StringParser<'a> {
let start_location = self.get_pos();
let parsed_spec = self.parse_spec(nested)?;
spec = Some(Box::new(Expr::from(ast::ExprJoinedStr {
spec = Some(Box::new(Expr::from(ast::ExprFString {
values: parsed_spec,
range: self.range(start_location),
})));
@ -671,7 +671,7 @@ pub(crate) fn parse_strings(
deduped.push(take_current(&mut current, current_start, current_end));
}
Ok(Expr::JoinedStr(ast::ExprJoinedStr {
Ok(Expr::FString(ast::ExprFString {
values: deduped,
range: TextRange::new(initial_start, last_end),
}))