mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-17 17:10:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Simplify the StringFlags trait (#15944)

Browse source
This commit is contained in:
Alex Waygood 2025-02-04 18:14:28 +00:00 • committed by GitHub
parent 64e64d2681
commit cb71393332
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/ruff_python_ast/src/nodes.rs
View file

@ -1027,18 +1027,20 @@ pub trait StringFlags: Copy {
self.quote_len()
}
fn as_any_string_flags(self) -> AnyStringFlags {
AnyStringFlags::new(self.prefix(), self.quote_style(), self.triple_quotes())
}
fn display_contents(self, contents: &str) -> DisplayFlags {
DisplayFlags {
prefix: self.prefix(),
quote_str: self.quote_str(),
flags: self.as_any_string_flags(),
contents,
}
}
}
pub struct DisplayFlags<'a> {
prefix: AnyStringPrefix,
quote_str: &'a str,
flags: AnyStringFlags,
contents: &'a str,
}
@ -1047,8 +1049,8 @@ impl std::fmt::Display for DisplayFlags<'_> {
write!(
f,
"{prefix}{quote}{contents}{quote}",
prefix = self.prefix,
quote = self.quote_str,
prefix = self.flags.prefix(),
quote = self.flags.quote_str(),
contents = self.contents
)
}
@ -2241,11 +2243,7 @@ impl From<AnyStringFlags> for StringLiteralFlags {
impl From<StringLiteralFlags> for AnyStringFlags {
fn from(value: StringLiteralFlags) -> Self {
Self::new(
AnyStringPrefix::Regular(value.prefix()),
value.quote_style(),
value.triple_quotes(),
)
value.as_any_string_flags()
}
}
@ -2266,11 +2264,7 @@ impl From<AnyStringFlags> for BytesLiteralFlags {
impl From<BytesLiteralFlags> for AnyStringFlags {
fn from(value: BytesLiteralFlags) -> Self {
Self::new(
AnyStringPrefix::Bytes(value.prefix()),
value.quote_style(),
value.triple_quotes(),
)
value.as_any_string_flags()
}
}
@ -2291,11 +2285,7 @@ impl From<AnyStringFlags> for FStringFlags {
impl From<FStringFlags> for AnyStringFlags {
fn from(value: FStringFlags) -> Self {
Self::new(
AnyStringPrefix::Format(value.prefix()),
value.quote_style(),
value.triple_quotes(),
)
value.as_any_string_flags()
}
}