[minor] Simplify some `ExprStringLiteral` creation logic (#15775)

This commit is contained in:
Alex Waygood 2025-01-27 18:51:13 +00:00 committed by GitHub
parent 9bf138c45a
commit 9c938442e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 18 deletions

View File

@ -3,8 +3,8 @@ use std::cmp::Ordering;
use ruff_diagnostics::{Applicability, Diagnostic, Edit, Fix, FixAvailability, Violation}; use ruff_diagnostics::{Applicability, Diagnostic, Edit, Fix, FixAvailability, Violation};
use ruff_macros::{derive_message_formats, ViolationMetadata}; use ruff_macros::{derive_message_formats, ViolationMetadata};
use ruff_python_ast::{ use ruff_python_ast::{
Expr, ExprCall, ExprContext, ExprList, ExprStringLiteral, ExprUnaryOp, StringLiteral, Expr, ExprCall, ExprContext, ExprList, ExprUnaryOp, StringLiteral, StringLiteralFlags,
StringLiteralFlags, StringLiteralValue, UnaryOp, StringLiteralValue, UnaryOp,
}; };
use ruff_text_size::{Ranged, TextRange}; use ruff_text_size::{Ranged, TextRange};
@ -120,13 +120,10 @@ fn construct_replacement(elts: &[&str], flags: StringLiteralFlags) -> Expr {
elts: elts elts: elts
.iter() .iter()
.map(|elt| { .map(|elt| {
Expr::StringLiteral(ExprStringLiteral { Expr::from(StringLiteral {
value: StringLiteralValue::single(StringLiteral {
value: Box::from(*elt), value: Box::from(*elt),
range: TextRange::default(), range: TextRange::default(),
flags, flags,
}),
range: TextRange::default(),
}) })
}) })
.collect(), .collect(),

View File

@ -90,9 +90,9 @@ pub(crate) fn assert_with_print_message(checker: &mut Checker, stmt: &ast::StmtA
mod print_arguments { mod print_arguments {
use itertools::Itertools; use itertools::Itertools;
use ruff_python_ast::{ use ruff_python_ast::{
Arguments, ConversionFlag, Expr, ExprFString, ExprStringLiteral, FString, FStringElement, Arguments, ConversionFlag, Expr, ExprFString, FString, FStringElement, FStringElements,
FStringElements, FStringExpressionElement, FStringFlags, FStringLiteralElement, FStringExpressionElement, FStringFlags, FStringLiteralElement, FStringValue, StringLiteral,
FStringValue, StringLiteral, StringLiteralFlags, StringLiteralValue, StringLiteralFlags,
}; };
use ruff_text_size::TextRange; use ruff_text_size::TextRange;
@ -202,13 +202,10 @@ mod print_arguments {
}) })
.join(&sep_string); .join(&sep_string);
Some(Expr::StringLiteral(ExprStringLiteral { Some(Expr::from(StringLiteral {
range: TextRange::default(),
value: StringLiteralValue::single(StringLiteral {
value: combined_string.into(), value: combined_string.into(),
flags, flags,
range: TextRange::default(), range: TextRange::default(),
}),
})) }))
} }

View File

@ -79,7 +79,7 @@ impl Transformer for Normalizer {
if can_join { if can_join {
string.value = ast::StringLiteralValue::single(ast::StringLiteral { string.value = ast::StringLiteralValue::single(ast::StringLiteral {
value: string.value.to_str().to_string().into_boxed_str(), value: Box::from(string.value.to_str()),
range: string.range, range: string.range,
flags: StringLiteralFlags::empty(), flags: StringLiteralFlags::empty(),
}); });