swc-project/swc
1
1
Fork 0
mirror of https://github.com/swc-project/swc.git synced 2024-11-23 17:54:15 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

perf(css): Optimize memory layout of ast types (#5823)

Browse Source
This commit is contained in:
Donny/강동윤 2022-09-11 22:56:48 +09:00 committed by GitHub
parent fb2c33e132
commit 4f119b2693
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 200 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/swc_css_ast/src/at_rule.rs
View File

@ -12,7 +12,7 @@ use crate::{
pub struct AtRule {
pub span: Span,
pub name: AtRuleName,
pub prelude: Option<AtRulePrelude>,
pub prelude: Option<Box<AtRulePrelude>>,
pub block: Option<SimpleBlock>,
}
@ -125,10 +125,10 @@ pub enum KeyframeSelector {
#[derive(Eq, Hash, EqIgnoreSpan)]
pub struct ImportPrelude {
pub span: Span,
pub href: ImportPreludeHref,
pub layer_name: Option<ImportPreludeLayerName>,
pub supports: Option<ImportPreludeSupportsType>,
pub media: Option<MediaQueryList>,
pub href: Box<ImportPreludeHref>,
pub layer_name: Option<Box<ImportPreludeLayerName>>,
pub supports: Option<Box<ImportPreludeSupportsType>>,
pub media: Option<Box<MediaQueryList>>,
}
#[ast_node]
@ -155,7 +155,7 @@ pub enum ImportPreludeSupportsType {
#[tag("SupportsCondition")]
SupportsCondition(SupportsCondition),
#[tag("Declaration")]
Declaration(Declaration),
Declaration(Box<Declaration>),
}
#[ast_node("NamespacePrelude")]
@ -163,7 +163,7 @@ pub enum ImportPreludeSupportsType {
pub struct NamespacePrelude {
pub span: Span,
pub prefix: Option<Ident>,
pub uri: NamespacePreludeUri,
pub uri: Box<NamespacePreludeUri>,
}
#[ast_node]
@ -189,7 +189,7 @@ pub struct MediaQuery {
pub modifier: Option<Ident>,
pub media_type: Option<MediaType>,
pub keyword: Option<Ident>,
pub condition: Option<MediaConditionType>,
pub condition: Option<Box<MediaConditionType>>,
}
impl EqIgnoreSpan for MediaQuery {
@ -309,7 +309,7 @@ pub enum MediaInParens {
MediaCondition(MediaCondition),
#[tag("MediaFeature")]
Feature(MediaFeature),
Feature(Box<MediaFeature>),
// TODO <general-enclosed>
}
@ -357,7 +357,7 @@ pub enum MediaFeatureValue {
pub struct MediaFeaturePlain {
pub span: Span,
pub name: MediaFeatureName,
pub value: MediaFeatureValue,
pub value: Box<MediaFeatureValue>,
}
#[ast_node("MediaFeatureBoolean")]
@ -401,22 +401,22 @@ pub enum MediaFeatureRangeComparison {
#[derive(Eq, Hash, EqIgnoreSpan)]
pub struct MediaFeatureRange {
pub span: Span,
pub left: MediaFeatureValue,
pub left: Box<MediaFeatureValue>,
pub comparison: MediaFeatureRangeComparison,
pub right: MediaFeatureValue,
pub right: Box<MediaFeatureValue>,
}
#[ast_node("MediaFeatureRangeInterval")]
#[derive(Eq, Hash, EqIgnoreSpan)]
pub struct MediaFeatureRangeInterval {
pub span: Span,
pub left: MediaFeatureValue,
pub left: Box<MediaFeatureValue>,
#[serde(rename = "leftComparison")]
pub left_comparison: MediaFeatureRangeComparison,
pub name: MediaFeatureName,
#[serde(rename = "rightComparison")]
pub right_comparison: MediaFeatureRangeComparison,
pub right: MediaFeatureValue,
pub right: Box<MediaFeatureValue>,
}
#[ast_node("SupportsCondition")]
@ -447,7 +447,7 @@ pub enum SupportsConditionType {
pub struct SupportsNot {
pub span: Span,
pub keyword: Option<Ident>,
pub condition: SupportsInParens,
pub condition: Box<SupportsInParens>,
}
impl EqIgnoreSpan for SupportsNot {
@ -461,7 +461,7 @@ impl EqIgnoreSpan for SupportsNot {
pub struct SupportsAnd {
pub span: Span,
pub keyword: Option<Ident>,
pub condition: SupportsInParens,
pub condition: Box<SupportsInParens>,
}
impl EqIgnoreSpan for SupportsAnd {
@ -475,7 +475,7 @@ impl EqIgnoreSpan for SupportsAnd {
pub struct SupportsOr {
pub span: Span,
pub keyword: Option<Ident>,
pub condition: SupportsInParens,
pub condition: Box<SupportsInParens>,
}
impl EqIgnoreSpan for SupportsOr {
@ -501,7 +501,7 @@ pub enum SupportsInParens {
#[derive(Eq, Hash, Is, EqIgnoreSpan)]
pub enum SupportsFeature {
#[tag("Declaration")]
Declaration(Declaration),
Declaration(Box<Declaration>),
#[tag("Function")]
Function(Function),
}

14
crates/swc_css_ast/src/base.rs
View File

@ -18,13 +18,13 @@ pub struct Stylesheet {
#[derive(Eq, Hash, Is, EqIgnoreSpan)]
pub enum Rule {
#[tag("QualifiedRule")]
QualifiedRule(QualifiedRule),
QualifiedRule(Box<QualifiedRule>),
#[tag("Tokens")]
Invalid(Tokens),
#[tag("AtRule")]
AtRule(AtRule),
AtRule(Box<AtRule>),
}
#[ast_node("QualifiedRule")]
@ -50,11 +50,11 @@ pub enum StyleBlock {
#[tag("ListOfComponentValues")]
ListOfComponentValues(ListOfComponentValues),
#[tag("AtRule")]
AtRule(AtRule),
AtRule(Box<AtRule>),
#[tag("Declaration")]
Declaration(Declaration),
Declaration(Box<Declaration>),
#[tag("QualifiedRule")]
QualifiedRule(QualifiedRule),
QualifiedRule(Box<QualifiedRule>),
}
#[ast_node("SimpleBlock")]
@ -149,9 +149,9 @@ pub enum ComponentValue {
#[derive(Eq, Hash, Is, EqIgnoreSpan)]
pub enum DeclarationOrAtRule {
#[tag("Declaration")]
Declaration(Declaration),
Declaration(Box<Declaration>),
#[tag("AtRule")]
AtRule(AtRule),
AtRule(Box<AtRule>),
// For recovery mode
#[tag("ListOfComponentValues")]
ListOfComponentValues(ListOfComponentValues),

4
crates/swc_css_ast/src/selector.rs
View File

@ -89,7 +89,7 @@ pub struct CompoundSelector {
pub span: Span,
/// "&"
pub nesting_selector: Option<NestingSelector>,
pub type_selector: Option<TypeSelector>,
pub type_selector: Option<Box<TypeSelector>>,
pub subclass_selectors: Vec<SubclassSelector>,
}
@ -184,7 +184,7 @@ pub enum SubclassSelector {
Class(ClassSelector),
#[tag("AttributeSelector")]
Attribute(AttributeSelector),
Attribute(Box<AttributeSelector>),
#[tag("PseudoClassSelector")]
PseudoClass(PseudoClassSelector),

2
crates/swc_css_ast/src/value.rs
View File

@ -366,7 +366,7 @@ pub enum BinOp {
pub struct Url {
pub span: Span,
pub name: Ident,
pub value: Option<UrlValue>,
pub value: Option<Box<UrlValue>>,
pub modifiers: Option<Vec<UrlModifier>>,
}

10
crates/swc_css_codegen/src/lib.rs
View File

@ -103,7 +103,7 @@ where
}
if n.block.is_some() {
match &n.prelude {
match n.prelude.as_deref() {
Some(AtRulePrelude::ListOfComponentValues(_)) | None => {}
_ => {
formatting_space!(self);
@ -180,7 +180,7 @@ where
emit!(self, n)
}
AtRulePrelude::ImportPrelude(n) => {
match n.href {
match &*n.href {
ImportPreludeHref::Url(_) => {
space!(self);
}
@ -197,7 +197,7 @@ where
Some(media_query)
if media_query.modifier.is_none() && media_query.media_type.is_none() =>
{
match &media_query.condition {
match media_query.condition.as_deref() {
Some(MediaConditionType::All(media_condition)) => !matches!(
media_condition.conditions.get(0),
Some(MediaConditionAllType::MediaInParens(_))
@ -280,7 +280,7 @@ where
emit!(self, layer_name);
if self.config.minify && (n.supports.is_some() || n.media.is_some()) {
if let ImportPreludeLayerName::Ident(_) = layer_name {
if let ImportPreludeLayerName::Ident(_) = &**layer_name {
space!(self);
}
}
@ -697,7 +697,7 @@ where
#[emitter]
fn emit_namespace_prelude(&mut self, n: &NamespacePrelude) -> Result {
let has_prefix = n.prefix.is_some();
let is_uri_url = match n.uri {
let is_uri_url = match &*n.uri {
NamespacePreludeUri::Url(_) => true,
NamespacePreludeUri::Str(_) => false,
};

1
crates/swc_css_lints/src/lib.rs
View File

@ -1,4 +1,5 @@
#![deny(clippy::all)]
#![feature(box_patterns)]
mod config;
mod dataset;

2
crates/swc_css_lints/src/rules/at_rule_no_unknown.rs
View File

@ -40,7 +40,7 @@ struct AtRuleNoUnknown {
impl Visit for AtRuleNoUnknown {
fn visit_at_rule(&mut self, at_rule: &AtRule) {
if let AtRuleName::Ident(Ident { value, .. }) = &at_rule.name {
if let Some(AtRulePrelude::ListOfComponentValues(_)) = at_rule.prelude {
if let Some(AtRulePrelude::ListOfComponentValues(_)) = at_rule.prelude.as_deref() {
if self.ignored.iter().all(|item| !item.is_match(&value)) {
let message = format!("Unexpected unknown at-rule \"@{}\".", &value);

2
crates/swc_css_lints/src/rules/declaration_no_important.rs
View File

@ -26,7 +26,7 @@ struct DeclarationNoImportant {
impl Visit for DeclarationNoImportant {
fn visit_at_rule(&mut self, keyframes_rule: &AtRule) {
if let Some(AtRulePrelude::KeyframesPrelude(_)) = keyframes_rule.prelude {
if let Some(AtRulePrelude::KeyframesPrelude(_)) = keyframes_rule.prelude.as_deref() {
self.keyframe_rules.push(keyframes_rule.span);
keyframes_rule.visit_children_with(self);

2
crates/swc_css_lints/src/rules/keyframe_declaration_no_important.rs
View File

@ -23,7 +23,7 @@ struct KeyframeDeclarationNoImportant {
impl Visit for KeyframeDeclarationNoImportant {
fn visit_at_rule(&mut self, at_rule: &AtRule) {
if let Some(AtRulePrelude::KeyframesPrelude(_)) = at_rule.prelude {
if let Some(AtRulePrelude::KeyframesPrelude(_)) = at_rule.prelude.as_deref() {
let old_value_in_keyframes_at_rule = self.in_keyframes_at_rule;
self.in_keyframes_at_rule = true;

6
crates/swc_css_lints/src/rules/no_duplicate_at_import_rules.rs
View File

@ -34,7 +34,7 @@ struct NoDuplicateAtImportRules {
impl Visit for NoDuplicateAtImportRules {
fn visit_at_rule(&mut self, at_rule: &AtRule) {
if let Some(AtRulePrelude::ImportPrelude(_)) = at_rule.prelude {
if let Some(AtRulePrelude::ImportPrelude(_)) = at_rule.prelude.as_deref() {
self.import_at_rules = Some(at_rule.clone());
at_rule.visit_children_with(self);
@ -44,11 +44,11 @@ impl Visit for NoDuplicateAtImportRules {
}
fn visit_import_prelude(&mut self, import_prelude: &ImportPrelude) {
let href = match &import_prelude.href {
let href = match &*import_prelude.href {
ImportPreludeHref::Str(Str { value, .. }) => value,
ImportPreludeHref::Url(Url {
value: Some(value), ..
}) => match value {
}) => match &**value {
UrlValue::Raw(UrlValueRaw { value, .. }) => value,
UrlValue::Str(Str { value, .. }) => value,
},

18
crates/swc_css_lints/src/rules/no_invalid_position_at_import_rule.rs
View File

@ -45,8 +45,8 @@ impl Visit for NoInvalidPositionAtImportRule {
if seen
&& matches!(
rule,
Rule::AtRule(AtRule {
prelude: Some(AtRulePrelude::ImportPrelude(_)),
Rule::AtRule(box AtRule {
prelude: Some(box AtRulePrelude::ImportPrelude(_)),
..
})
)
@ -57,17 +57,17 @@ impl Visit for NoInvalidPositionAtImportRule {
// TODO improve me https://www.w3.org/TR/css-cascade-5/#layer-empty - @import and @namespace rules must be consecutive
match rule {
Rule::AtRule(
AtRule {
prelude: Some(AtRulePrelude::CharsetPrelude(_)),
box AtRule {
prelude: Some(box AtRulePrelude::CharsetPrelude(_)),
..
}
| AtRule {
prelude: Some(AtRulePrelude::ImportPrelude(_)),
| box AtRule {
prelude: Some(box AtRulePrelude::ImportPrelude(_)),
..
},
) => seen,
Rule::AtRule(AtRule {
prelude: Some(AtRulePrelude::LayerPrelude(_)),
Rule::AtRule(box AtRule {
prelude: Some(box AtRulePrelude::LayerPrelude(_)),
block,
..
}) => match block {
@ -75,7 +75,7 @@ impl Visit for NoInvalidPositionAtImportRule {
None => seen,
_ => true,
},
Rule::AtRule(AtRule { name, .. }) => {
Rule::AtRule(box AtRule { name, .. }) => {
let name = match name {
AtRuleName::DashedIdent(dashed_ident) => &dashed_ident.value,
AtRuleName::Ident(ident) => &ident.value,

6
crates/swc_css_minifier/src/compress/at_rule.rs
View File

@ -29,7 +29,7 @@ impl VisitMut for CompressAtRule {
}
}
let new_value = match value {
let new_value = match &mut **value {
UrlValue::Str(Str { value, .. }) => value,
UrlValue::Raw(UrlValueRaw { value, .. }) => value,
};
@ -149,8 +149,8 @@ impl VisitMut for CompressAtRule {
if !self.stylesheet_has_non_ascii_characters {
match stylesheet.rules.get(0) {
Some(Rule::AtRule(AtRule {
prelude: Some(AtRulePrelude::CharsetPrelude(Str { value, .. })),
Some(Rule::AtRule(box AtRule {
prelude: Some(box AtRulePrelude::CharsetPrelude(Str { value, .. })),
..
})) if value.as_ref().eq_ignore_ascii_case("utf-8") => {
stylesheet.rules.remove(0);

20
crates/swc_css_minifier/src/compressor/empty.rs
View File

@ -6,8 +6,8 @@ use super::Compressor;
impl Compressor {
pub(super) fn compresss_empty_stylesheet(&self, stylesheet: &mut Stylesheet) {
stylesheet.rules.retain(|rule| match rule {
Rule::QualifiedRule(QualifiedRule { block, .. }) if block.value.is_empty() => false,
Rule::AtRule(AtRule {
Rule::QualifiedRule(box QualifiedRule { block, .. }) if block.value.is_empty() => false,
Rule::AtRule(box AtRule {
name: AtRuleName::Ident(Ident { value, .. }),
block: Some(block),
..
@ -18,17 +18,19 @@ impl Compressor {
pub(super) fn compresss_empty_simple_block(&self, simple_block: &mut SimpleBlock) {
simple_block.value.retain(|rule| match rule {
ComponentValue::Rule(Rule::QualifiedRule(QualifiedRule { block, .. }))
| ComponentValue::Rule(Rule::AtRule(AtRule {
ComponentValue::Rule(Rule::QualifiedRule(box QualifiedRule { block, .. }))
| ComponentValue::Rule(Rule::AtRule(box AtRule {
block: Some(block), ..
}))
| ComponentValue::StyleBlock(StyleBlock::QualifiedRule(QualifiedRule {
block, ..
| ComponentValue::StyleBlock(StyleBlock::QualifiedRule(box QualifiedRule {
block,
..
}))
| ComponentValue::StyleBlock(StyleBlock::AtRule(AtRule {
block: Some(block), ..
| ComponentValue::StyleBlock(StyleBlock::AtRule(box AtRule {
block: Some(block),
..
}))
| ComponentValue::DeclarationOrAtRule(DeclarationOrAtRule::AtRule(AtRule {
| ComponentValue::DeclarationOrAtRule(DeclarationOrAtRule::AtRule(box AtRule {
block: Some(block),
..
}))

6
crates/swc_css_minifier/src/compressor/keyframes.rs
View File

@ -6,7 +6,7 @@ use super::Compressor;
impl Compressor {
pub(super) fn compress_keyframes_at_rule(&mut self, at_rule: &mut AtRule) {
match &at_rule.prelude {
match at_rule.prelude.as_deref() {
Some(AtRulePrelude::KeyframesPrelude(KeyframesName::Str(string)))
if !matches!(
string.value.to_ascii_lowercase(),
@ -18,13 +18,13 @@ impl Compressor {
| js_word!("none")
) =>
{
at_rule.prelude = Some(AtRulePrelude::KeyframesPrelude(
at_rule.prelude = Some(Box::new(AtRulePrelude::KeyframesPrelude(
KeyframesName::CustomIdent(CustomIdent {
span: string.span,
value: string.value.to_string().into(),
raw: None,
}),
));
)));
}
_ => {}
}

2
crates/swc_css_minifier/src/compressor/selector.rs
View File

@ -253,7 +253,7 @@ impl Compressor {
}
if let Some(TypeSelector::Universal(UniversalSelector { prefix: None, .. })) =
&compound_selector.type_selector
compound_selector.type_selector.as_deref()
{
compound_selector.type_selector = None;
}

6
crates/swc_css_minifier/src/compressor/url.rs
View File

@ -15,7 +15,7 @@ impl Compressor {
}
}
if let Some(UrlValue::Str(Str { value, span, .. })) = &url.value {
if let Some(UrlValue::Str(Str { value, span, .. })) = url.value.as_deref() {
let mut escaped = String::new();
let mut has_escaped = false;
@ -43,13 +43,13 @@ impl Compressor {
}
}
url.value = Some(UrlValue::Raw(UrlValueRaw {
url.value = Some(Box::new(UrlValue::Raw(UrlValueRaw {
span: *span,
value: escaped.into(),
before: None,
raw: None,
after: None,
}));
})));
}
}
}

1
crates/swc_css_minifier/src/lib.rs
View File

@ -1,3 +1,4 @@
#![feature(box_patterns)]
#![deny(clippy::all)]
#![allow(clippy::match_like_matches_macro)]
#![allow(clippy::needless_update)]

75
crates/swc_css_parser/src/parser/at_rule.rs
View File

@ -51,7 +51,7 @@ where
prelude: None,
block: None,
};
let parse_prelude = |parser: &mut Parser<I>| -> PResult<Option<AtRulePrelude>> {
let parse_prelude = |parser: &mut Parser<I>| -> PResult<Option<Box<AtRulePrelude>>> {
match lowercased_name {
"viewport" | "-ms-viewport" | "-o-viewport" | "font-face" => {
parser.input.skip_ws();
@ -85,7 +85,7 @@ where
return Err(Error::new(span, ErrorKind::Expected("';' token")));
}
Ok(Some(prelude))
Ok(Some(Box::new(prelude)))
}
"counter-style" => {
parser.input.skip_ws();
@ -100,7 +100,7 @@ where
return Err(Error::new(span, ErrorKind::Expected("'{' token")));
}
Ok(Some(prelude))
Ok(Some(Box::new(prelude)))
}
"font-palette-values" => {
parser.input.skip_ws();
@ -115,7 +115,7 @@ where
return Err(Error::new(span, ErrorKind::Expected("'{' token")));
}
Ok(Some(prelude))
Ok(Some(Box::new(prelude)))
}
"font-feature-values" => {
parser.input.skip_ws();
@ -130,7 +130,7 @@ where
return Err(Error::new(span, ErrorKind::Expected("'{' token")));
}
Ok(Some(prelude))
Ok(Some(Box::new(prelude)))
}
"stylistic" | "historical-forms" | "styleset" | "character-variant" | "swash"
| "ornaments" | "annotation"
@ -202,7 +202,7 @@ where
}
}
Ok(prelude)
Ok(prelude.map(Box::new))
}
"document" | "-moz-document" => {
parser.input.skip_ws();
@ -236,7 +236,7 @@ where
return Err(Error::new(span, ErrorKind::Expected("'{' token")));
}
Ok(Some(prelude))
Ok(Some(Box::new(prelude)))
}
"page" => {
parser.input.skip_ws();
@ -249,7 +249,7 @@ where
parser.input.skip_ws();
Ok(prelude)
Ok(prelude.map(Box::new))
}
"top-left-corner"
| "top-left"
@ -286,7 +286,7 @@ where
return Err(Error::new(span, ErrorKind::Expected("'{' token")));
}
Ok(Some(prelude))
Ok(Some(Box::new(prelude)))
}
"namespace" => {
parser.input.skip_ws();
@ -322,7 +322,7 @@ where
let prelude = AtRulePrelude::NamespacePrelude(NamespacePrelude {
span: span!(parser, span.lo),
prefix,
uri,
uri: Box::new(uri),
});
if !is!(parser, ";") {
@ -331,7 +331,7 @@ where
return Err(Error::new(span, ErrorKind::Expected("';' token")));
}
Ok(Some(prelude))
Ok(Some(Box::new(prelude)))
}
"color-profile" => {
parser.input.skip_ws();
@ -351,7 +351,7 @@ where
}
};
let prelude = AtRulePrelude::ColorProfilePrelude(name);
let prelude = Box::new(AtRulePrelude::ColorProfilePrelude(name));
parser.input.skip_ws();
@ -366,7 +366,7 @@ where
"nest" => {
parser.input.skip_ws();
let prelude = AtRulePrelude::NestPrelude(parser.parse()?);
let prelude = Box::new(AtRulePrelude::NestPrelude(parser.parse()?));
parser.input.skip_ws();
@ -384,7 +384,7 @@ where
let media = if !is!(parser, "{") {
let media_query_list = parser.parse()?;
Some(AtRulePrelude::MediaPrelude(media_query_list))
Some(Box::new(AtRulePrelude::MediaPrelude(media_query_list)))
} else {
None
};
@ -396,7 +396,7 @@ where
"supports" => {
parser.input.skip_ws();
let prelude = AtRulePrelude::SupportsPrelude(parser.parse()?);
let prelude = Box::new(AtRulePrelude::SupportsPrelude(parser.parse()?));
parser.input.skip_ws();
@ -406,7 +406,7 @@ where
parser.input.skip_ws();
let span = parser.input.cur_span();
let href = match cur!(parser) {
let href = Box::new(match cur!(parser) {
tok!("string") => ImportPreludeHref::Str(parser.parse()?),
tok!("url") => ImportPreludeHref::Url(parser.parse()?),
tok!("function") => ImportPreludeHref::Url(parser.parse()?),
@ -416,7 +416,7 @@ where
ErrorKind::Expected("string, url or function token"),
))
}
};
});
parser.input.skip_ws();
@ -426,7 +426,7 @@ where
parser.input.skip_ws();
Some(name)
Some(Box::new(name))
}
Token::Function { value, .. }
if *value.to_ascii_lowercase() == *"layer" =>
@ -443,7 +443,7 @@ where
parser.input.skip_ws();
Some(name)
Some(Box::new(name))
}
_ => None,
};
@ -465,7 +465,7 @@ where
expect!(parser, ")");
Some(supports)
Some(Box::new(supports))
}
_ => None,
};
@ -478,13 +478,13 @@ where
parser.input.skip_ws();
let prelude = AtRulePrelude::ImportPrelude(ImportPrelude {
let prelude = Box::new(AtRulePrelude::ImportPrelude(ImportPrelude {
span: span!(parser, span.lo),
href,
layer_name,
supports,
media,
});
}));
if !is!(parser, ";") {
let span = parser.input.cur_span();
@ -498,7 +498,7 @@ where
| "-ms-keyframes" => {
parser.input.skip_ws();
let prelude = AtRulePrelude::KeyframesPrelude(parser.parse()?);
let prelude = Box::new(AtRulePrelude::KeyframesPrelude(parser.parse()?));
parser.input.skip_ws();
@ -697,19 +697,20 @@ where
let span = self.input.cur_span();
let mut list_of_component_value = match at_rule.prelude {
let mut list_of_component_value = match at_rule.prelude.as_deref_mut() {
Some(AtRulePrelude::ListOfComponentValues(
ref mut list_of_component_value,
)) => list_of_component_value,
_ => {
at_rule.prelude = Some(AtRulePrelude::ListOfComponentValues(
ListOfComponentValues {
span: span!(self, span.lo),
children: vec![],
},
));
at_rule.prelude =
Some(Box::new(AtRulePrelude::ListOfComponentValues(
ListOfComponentValues {
span: span!(self, span.lo),
children: vec![],
},
)));
match at_rule.prelude {
match at_rule.prelude.as_deref_mut() {
Some(AtRulePrelude::ListOfComponentValues(
ref mut list_of_component_value,
)) => list_of_component_value,
@ -1239,7 +1240,7 @@ where
modifier: None,
media_type: None,
keyword: None,
condition: Some(MediaConditionType::All(condition)),
condition: Some(Box::new(MediaConditionType::All(condition))),
})
} else {
let media_type = Some(self.parse()?);
@ -1254,11 +1255,11 @@ where
self.input.skip_ws();
condition_without_or = Some(MediaConditionType::WithoutOr(self.parse()?));
condition_without_or = Some(Box::new(MediaConditionType::WithoutOr(self.parse()?)));
}
let end_pos = if let Some(MediaConditionType::WithoutOr(condition_without_or)) =
&condition_without_or
condition_without_or.as_deref()
{
condition_without_or.span.hi
} else if let Some(MediaType::Ident(ident)) = &media_type {
@ -1603,9 +1604,9 @@ where
if eat!(self, ")") {
return Ok(MediaFeature::Range(MediaFeatureRange {
span: span!(self, span.lo),
left,
left: Box::new(left),
comparison: left_comparison,
right: center,
right: Box::new(center),
}));
}
@ -1674,7 +1675,7 @@ where
Ok(MediaFeature::RangeInterval(MediaFeatureRangeInterval {
span: span!(self, span.lo),
left,
left: Box::new(left),
left_comparison,
name,
right_comparison,

6
crates/swc_css_parser/src/parser/value/mod.rs
View File

@ -2211,7 +2211,7 @@ where
value: name,
raw: Some(raw_name),
};
let value = Some(UrlValue::Raw(UrlValueRaw {
let value = Some(Box::new(UrlValue::Raw(UrlValueRaw {
span: swc_common::Span::new(
span.lo + BytePos(name_length + 1),
span.hi - BytePos(1),
@ -2221,7 +2221,7 @@ where
before: Some(before),
raw: Some(raw_value),
after: Some(after),
}));
})));
Ok(Url {
span: span!(self, span.lo),
@ -2252,7 +2252,7 @@ where
self.input.skip_ws();
let value = match cur!(self) {
tok!("string") => Some(UrlValue::Str(self.parse()?)),
tok!("string") => Some(Box::new(UrlValue::Str(self.parse()?))),
_ => None,
};

3
crates/swc_css_prefixer/src/lib.rs
View File

@ -1,3 +1,6 @@
#![feature(box_patterns)]
#![allow(clippy::vec_box)]
pub use self::prefixer::prefixer;
pub mod options;

90
crates/swc_css_prefixer/src/prefixer.rs
View File

@ -252,11 +252,11 @@ impl VisitMut for ImageSetFunctionReplacerOnLegacyVariant<'_> {
value: "url".into(),
raw: None,
},
value: Some(UrlValue::Str(Str {
value: Some(Box::new(UrlValue::Str(Str {
span: DUMMY_SP,
value: value.as_ref().into(),
raw: None,
})),
}))),
modifiers: Some(vec![]),
})
}
@ -484,7 +484,7 @@ impl VisitMut for MediaFeatureResolutionReplacerOnLegacyVariant<'_> {
value: resolution_value,
unit: resolution_unit,
..
})) = &n.value
})) = &*n.value
{
let MediaFeatureName::Ident(Ident {
value: feature_name_value,
@ -505,11 +505,11 @@ impl VisitMut for MediaFeatureResolutionReplacerOnLegacyVariant<'_> {
_ => resolution_value.value,
};
n.value = MediaFeatureValue::Number(Number {
n.value = Box::new(MediaFeatureValue::Number(Number {
span: resolution_value.span,
value: left,
raw: None,
});
}));
}
}
}
@ -548,18 +548,19 @@ struct Prefixer {
simple_block: Option<SimpleBlock>,
rule_prefix: Option<Prefix>,
added_top_rules: Vec<(Prefix, Rule)>,
added_at_rules: Vec<(Prefix, AtRule)>,
added_qualified_rules: Vec<(Prefix, QualifiedRule)>,
added_declarations: Vec<Declaration>,
added_at_rules: Vec<(Prefix, Box<AtRule>)>,
added_qualified_rules: Vec<(Prefix, Box<QualifiedRule>)>,
added_declarations: Vec<Box<Declaration>>,
}
impl Prefixer {
fn add_at_rule(&mut self, prefix: Prefix, at_rule: &AtRule) {
if self.simple_block.is_none() {
self.added_top_rules
.push((prefix, Rule::AtRule(at_rule.clone())));
.push((prefix, Rule::AtRule(Box::new(at_rule.clone()))));
} else {
self.added_at_rules.push((prefix, at_rule.clone()));
self.added_at_rules
.push((prefix, Box::new(at_rule.clone())));
}
}
}
@ -699,7 +700,7 @@ impl VisitMut for Prefixer {
if !self.added_declarations.is_empty() {
if let Some(ImportPreludeSupportsType::Declaration(declaration)) =
import_prelude.supports.take()
import_prelude.supports.take().map(|v| *v)
{
let span = declaration.span;
let mut conditions = Vec::with_capacity(1 + self.added_declarations.len());
@ -712,15 +713,18 @@ impl VisitMut for Prefixer {
let supports_condition_type = SupportsConditionType::Or(SupportsOr {
span: DUMMY_SP,
keyword: None,
condition: SupportsInParens::Feature(SupportsFeature::Declaration(n)),
condition: Box::new(SupportsInParens::Feature(
SupportsFeature::Declaration(n),
)),
});
conditions.push(supports_condition_type);
}
import_prelude.supports = Some(ImportPreludeSupportsType::SupportsCondition(
SupportsCondition { span, conditions },
));
import_prelude.supports =
Some(Box::new(ImportPreludeSupportsType::SupportsCondition(
SupportsCondition { span, conditions },
)));
}
}
}
@ -751,7 +755,9 @@ impl VisitMut for Prefixer {
let supports_condition_type = SupportsConditionType::Or(SupportsOr {
span: DUMMY_SP,
keyword: None,
condition: SupportsInParens::Feature(SupportsFeature::Declaration(n)),
condition: Box::new(SupportsInParens::Feature(
SupportsFeature::Declaration(n),
)),
});
let need_skip =
@ -897,11 +903,11 @@ impl VisitMut for Prefixer {
}
if !n.prelude.eq_ignore_span(&new_webkit_prelude) {
let qualified_rule = QualifiedRule {
let qualified_rule = Box::new(QualifiedRule {
span: DUMMY_SP,
prelude: new_webkit_prelude,
block: original_simple_block.clone(),
};
});
if self.simple_block.is_none() {
self.added_top_rules
@ -966,11 +972,11 @@ impl VisitMut for Prefixer {
);
if new_moz_prelude_with_previous != new_moz_prelude {
let qualified_rule = QualifiedRule {
let qualified_rule = Box::new(QualifiedRule {
span: DUMMY_SP,
prelude: new_moz_prelude_with_previous,
block: original_simple_block.clone(),
};
});
if self.simple_block.is_none() {
self.added_top_rules
@ -999,10 +1005,10 @@ impl VisitMut for Prefixer {
if self.simple_block.is_none() {
self.added_top_rules
.push((Prefix::Moz, Rule::QualifiedRule(qualified_rule)));
.push((Prefix::Moz, Rule::QualifiedRule(Box::new(qualified_rule))));
} else {
self.added_qualified_rules
.push((Prefix::Moz, qualified_rule));
.push((Prefix::Moz, Box::new(qualified_rule)));
}
}
}
@ -1052,11 +1058,11 @@ impl VisitMut for Prefixer {
);
if new_ms_prelude_with_previous != new_ms_prelude {
let qualified_rule = QualifiedRule {
let qualified_rule = Box::new(QualifiedRule {
span: DUMMY_SP,
prelude: new_ms_prelude_with_previous,
block: original_simple_block.clone(),
};
});
if self.simple_block.is_none() {
self.added_top_rules
@ -1077,11 +1083,11 @@ impl VisitMut for Prefixer {
}
if !n.prelude.eq_ignore_span(&new_ms_prelude) {
let qualified_rule = QualifiedRule {
let qualified_rule = Box::new(QualifiedRule {
span: DUMMY_SP,
prelude: new_ms_prelude,
block: original_simple_block,
};
});
if self.simple_block.is_none() {
self.added_top_rules
@ -1424,12 +1430,12 @@ impl VisitMut for Prefixer {
let value: Option<Box<dyn Fn() -> Vec<ComponentValue>>> = $value;
if let Some(value) = value {
self.added_declarations.push(Declaration {
self.added_declarations.push(Box::new(Declaration {
span: n.span,
name,
value: value(),
important: n.important.clone(),
});
}));
} else {
let new_value = match $prefix {
Prefix::Webkit => webkit_value.clone(),
@ -1438,12 +1444,12 @@ impl VisitMut for Prefixer {
Prefix::Ms => ms_value.clone(),
};
self.added_declarations.push(Declaration {
self.added_declarations.push(Box::new(Declaration {
span: n.span,
name,
value: new_value,
important: n.important.clone(),
});
}));
}
}
}
@ -1661,12 +1667,12 @@ impl VisitMut for Prefixer {
}
if n.value != old_spec_webkit_value {
self.added_declarations.push(Declaration {
self.added_declarations.push(Box::new(Declaration {
span: n.span,
name: n.name.clone(),
value: old_spec_webkit_value,
important: n.important.clone(),
});
}));
}
if should_prefix("-webkit-flex:display", self.env, false) {
@ -2541,12 +2547,12 @@ impl VisitMut for Prefixer {
"writing-mode" if n.value.len() == 1 => {
let direction = match declarations.iter().rev().find(|declaration| {
matches!(declaration, Declaration {
matches!(&****declaration, Declaration {
name: DeclarationName::Ident(Ident { value, .. }),
..
} if value.as_ref().eq_ignore_ascii_case("direction"))
}) {
Some(Declaration { value, .. }) => match value.get(0) {
Some(box Declaration { value, .. }) => match value.get(0) {
Some(ComponentValue::Ident(Ident { value, .. }))
if value.as_ref().eq_ignore_ascii_case("rtl") =>
{
@ -3039,39 +3045,39 @@ impl VisitMut for Prefixer {
}
if n.value != webkit_value {
self.added_declarations.push(Declaration {
self.added_declarations.push(Box::new(Declaration {
span: n.span,
name: n.name.clone(),
value: webkit_value,
important: n.important.clone(),
});
}));
}
if n.value != moz_value {
self.added_declarations.push(Declaration {
self.added_declarations.push(Box::new(Declaration {
span: n.span,
name: n.name.clone(),
value: moz_value,
important: n.important.clone(),
});
}));
}
if n.value != o_value {
self.added_declarations.push(Declaration {
self.added_declarations.push(Box::new(Declaration {
span: n.span,
name: n.name.clone(),
value: o_value,
important: n.important.clone(),
});
}));
}
if n.value != ms_value {
self.added_declarations.push(Declaration {
self.added_declarations.push(Box::new(Declaration {
span: n.span,
name: n.name.clone(),
value: ms_value,
important: n.important.clone(),
});
}));
}
}
}

56
crates/swc_css_visit/src/lib.rs
View File

@ -130,14 +130,14 @@ define!({
pub enum StyleBlock {
ListOfComponentValues(ListOfComponentValues),
AtRule(AtRule),
Declaration(Declaration),
QualifiedRule(QualifiedRule),
AtRule(Box<AtRule>),
Declaration(Box<Declaration>),
QualifiedRule(Box<QualifiedRule>),
}
pub enum DeclarationOrAtRule {
Declaration(Declaration),
AtRule(AtRule),
Declaration(Box<Declaration>),
AtRule(Box<AtRule>),
ListOfComponentValues(ListOfComponentValues),
}
@ -258,7 +258,7 @@ define!({
pub struct Url {
pub span: Span,
pub name: Ident,
pub value: Option<UrlValue>,
pub value: Option<Box<UrlValue>>,
pub modifiers: Option<Vec<UrlModifier>>,
}
@ -392,7 +392,7 @@ define!({
pub struct CompoundSelector {
pub span: Span,
pub nesting_selector: Option<NestingSelector>,
pub type_selector: Option<TypeSelector>,
pub type_selector: Option<Box<TypeSelector>>,
pub subclass_selectors: Vec<SubclassSelector>,
}
@ -434,7 +434,7 @@ define!({
pub enum SubclassSelector {
Id(IdSelector),
Class(ClassSelector),
Attribute(AttributeSelector),
Attribute(Box<AttributeSelector>),
PseudoClass(PseudoClassSelector),
PseudoElement(PseudoElementSelector),
}
@ -523,17 +523,17 @@ define!({
}
pub enum Rule {
QualifiedRule(QualifiedRule),
AtRule(AtRule),
QualifiedRule(Box<QualifiedRule>),
AtRule(Box<AtRule>),
Invalid(Tokens),
}
pub struct ImportPrelude {
pub span: Span,
pub href: ImportPreludeHref,
pub layer_name: Option<ImportPreludeLayerName>,
pub supports: Option<ImportPreludeSupportsType>,
pub media: Option<MediaQueryList>,
pub href: Box<ImportPreludeHref>,
pub layer_name: Option<Box<ImportPreludeLayerName>>,
pub supports: Option<Box<ImportPreludeSupportsType>>,
pub media: Option<Box<MediaQueryList>>,
}
pub enum ImportPreludeHref {
@ -548,13 +548,13 @@ define!({
pub enum ImportPreludeSupportsType {
SupportsCondition(SupportsCondition),
Declaration(Declaration),
Declaration(Box<Declaration>),
}
pub struct NamespacePrelude {
pub span: Span,
pub prefix: Option<Ident>,
pub uri: NamespacePreludeUri,
pub uri: Box<NamespacePreludeUri>,
}
pub enum NamespacePreludeUri {
@ -565,7 +565,7 @@ define!({
pub struct AtRule {
pub span: Span,
pub name: AtRuleName,
pub prelude: Option<AtRulePrelude>,
pub prelude: Option<Box<AtRulePrelude>>,
pub block: Option<SimpleBlock>,
}
@ -659,7 +659,7 @@ define!({
pub modifier: Option<Ident>,
pub media_type: Option<MediaType>,
pub keyword: Option<Ident>,
pub condition: Option<MediaConditionType>,
pub condition: Option<Box<MediaConditionType>>,
}
pub enum MediaType {
@ -714,7 +714,7 @@ define!({
pub enum MediaInParens {
MediaCondition(MediaCondition),
Feature(MediaFeature),
Feature(Box<MediaFeature>),
}
pub enum MediaFeature {
@ -738,7 +738,7 @@ define!({
pub struct MediaFeaturePlain {
pub span: Span,
pub name: MediaFeatureName,
pub value: MediaFeatureValue,
pub value: Box<MediaFeatureValue>,
}
pub struct MediaFeatureBoolean {
@ -748,18 +748,18 @@ define!({
pub struct MediaFeatureRange {
pub span: Span,
pub left: MediaFeatureValue,
pub left: Box<MediaFeatureValue>,
pub comparison: MediaFeatureRangeComparison,
pub right: MediaFeatureValue,
pub right: Box<MediaFeatureValue>,
}
pub struct MediaFeatureRangeInterval {
pub span: Span,
pub left: MediaFeatureValue,
pub left: Box<MediaFeatureValue>,
pub left_comparison: MediaFeatureRangeComparison,
pub name: MediaFeatureName,
pub right_comparison: MediaFeatureRangeComparison,
pub right: MediaFeatureValue,
pub right: Box<MediaFeatureValue>,
}
pub struct PageSelectorList {
@ -798,19 +798,19 @@ define!({
pub struct SupportsNot {
pub span: Span,
pub keyword: Option<Ident>,
pub condition: SupportsInParens,
pub condition: Box<SupportsInParens>,
}
pub struct SupportsAnd {
pub span: Span,
pub keyword: Option<Ident>,
pub condition: SupportsInParens,
pub condition: Box<SupportsInParens>,
}
pub struct SupportsOr {
pub span: Span,
pub keyword: Option<Ident>,
pub condition: SupportsInParens,
pub condition: Box<SupportsInParens>,
}
pub enum SupportsInParens {
@ -820,7 +820,7 @@ define!({
}
pub enum SupportsFeature {
Declaration(Declaration),
Declaration(Box<Declaration>),
Function(Function),
}

15
crates/swc_html_minifier/src/lib.rs
View File

@ -1,4 +1,6 @@
#![deny(clippy::all)]
#![feature(box_patterns)]
#![feature(box_syntax)]
use std::cmp::Ordering;
@ -1694,7 +1696,7 @@ impl Minifier<'_> {
swc_css_ast::Stylesheet {
span: Default::default(),
rules: vec![swc_css_ast::Rule::QualifiedRule(
swc_css_ast::QualifiedRule {
box swc_css_ast::QualifiedRule {
span: Default::default(),
prelude: swc_css_ast::QualifiedRulePrelude::SelectorList(
swc_css_ast::SelectorList {
@ -1722,14 +1724,14 @@ impl Minifier<'_> {
) {
Ok(media_query_list) => swc_css_ast::Stylesheet {
span: Default::default(),
rules: vec![swc_css_ast::Rule::AtRule(swc_css_ast::AtRule {
rules: vec![swc_css_ast::Rule::AtRule(box swc_css_ast::AtRule {
span: Default::default(),
name: swc_css_ast::AtRuleName::Ident(swc_css_ast::Ident {
span: Default::default(),
value: "media".into(),
raw: None,
}),
prelude: Some(swc_css_ast::AtRulePrelude::MediaPrelude(
prelude: Some(box swc_css_ast::AtRulePrelude::MediaPrelude(
media_query_list,
)),
block: Some(swc_css_ast::SimpleBlock {
@ -1776,7 +1778,7 @@ impl Minifier<'_> {
let swc_css_ast::Stylesheet { rules, .. } = &stylesheet;
// Because CSS is grammar free, protect for fails
if let Some(swc_css_ast::Rule::QualifiedRule(swc_css_ast::QualifiedRule {
if let Some(swc_css_ast::Rule::QualifiedRule(box swc_css_ast::QualifiedRule {
block,
..
})) = rules.get(0)
@ -1792,8 +1794,9 @@ impl Minifier<'_> {
let swc_css_ast::Stylesheet { rules, .. } = &stylesheet;
// Because CSS is grammar free, protect for fails
if let Some(swc_css_ast::Rule::AtRule(swc_css_ast::AtRule { prelude, .. })) =
rules.get(0)
if let Some(swc_css_ast::Rule::AtRule(box swc_css_ast::AtRule {
prelude, ..
})) = rules.get(0)
{
swc_css_codegen::Emit::emit(&mut gen, &prelude).unwrap();