shadowfacts/grass
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rustfmt

Browse Source
This commit is contained in:
Connor Skees 2021-07-03 18:46:22 -04:00
parent e5d73ac265
commit b631ad78bc
5 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/parse/ident.rs
View File

@ -99,8 +99,12 @@ impl<'a> Parser<'a> {
value += as_hex(next.kind); value += as_hex(next.kind);
self.toks.next(); self.toks.next();
} }
if matches!(self.toks.peek(), Some(Token { kind: ' ', .. }) | Some(Token { kind: '\n', .. }) | Some(Token { kind: '\t', .. })) if matches!(
{ self.toks.peek(),
Some(Token { kind: ' ', .. })
| Some(Token { kind: '\n', .. })
| Some(Token { kind: '\t', .. })
) {
self.toks.next(); self.toks.next();
} }
} else { } else {

10
src/parse/module.rs
View File

@ -68,10 +68,12 @@ impl<'a> Parser<'a> {
self.expect_char(':')?; self.expect_char(':')?;
self.whitespace_or_comment(); self.whitespace_or_comment();
let value = self.parse_value( let value = self.parse_value(false, &|toks| {
false, matches!(
&|toks| matches!(toks.peek(), Some(Token { kind: ',', .. }) | Some(Token { kind: ')', .. })) toks.peek(),
)?; Some(Token { kind: ',', .. }) | Some(Token { kind: ')', .. })
)
})?;
config.insert(name.map_node(|n| n.into()), value)?; config.insert(name.map_node(|n| n.into()), value)?;

20
src/parse/value/css_function.rs
View File

@ -205,16 +205,20 @@ impl<'a> Parser<'a> {
match self.toks.peek() { match self.toks.peek() {
Some(Token { kind: 'i', .. }) | Some(Token { kind: 'I', .. }) => { Some(Token { kind: 'i', .. }) | Some(Token { kind: 'I', .. }) => {
self.toks.advance_cursor(); self.toks.advance_cursor();
if !matches!(self.toks.peek(), Some(Token { kind: 'n', .. }) | Some(Token { kind: 'N', .. })) if !matches!(
{ self.toks.peek(),
Some(Token { kind: 'n', .. }) | Some(Token { kind: 'N', .. })
) {
return Ok(None); return Ok(None);
} }
buf.push_str("min(") buf.push_str("min(")
} }
Some(Token { kind: 'a', .. }) | Some(Token { kind: 'A', .. }) => { Some(Token { kind: 'a', .. }) | Some(Token { kind: 'A', .. }) => {
self.toks.advance_cursor(); self.toks.advance_cursor();
if !matches!(self.toks.peek(), Some(Token { kind: 'x', .. }) | Some(Token { kind: 'X', .. })) if !matches!(
{ self.toks.peek(),
Some(Token { kind: 'x', .. }) | Some(Token { kind: 'X', .. })
) {
return Ok(None); return Ok(None);
} }
buf.push_str("max(") buf.push_str("max(")
@ -377,8 +381,12 @@ impl<'a> Parser<'a> {
span = span.merge(next.pos); span = span.merge(next.pos);
self.toks.peek_forward(1); self.toks.peek_forward(1);
} }
if matches!(self.toks.peek(), Some(Token { kind: ' ', .. }) | Some(Token { kind: '\n', .. }) | Some(Token { kind: '\t', .. })) if matches!(
{ self.toks.peek(),
Some(Token { kind: ' ', .. })
| Some(Token { kind: '\n', .. })
| Some(Token { kind: '\t', .. })
) {
self.toks.peek_forward(1); self.toks.peek_forward(1);
} }
} else { } else {

7
src/parse/variable.rs
View File

@ -115,7 +115,12 @@ impl<'a> Parser<'a> {
let value = self.parse_value(true, &|toks| { let value = self.parse_value(true, &|toks| {
if matches!(toks.peek(), Some(Token { kind: '!', .. })) { if matches!(toks.peek(), Some(Token { kind: '!', .. })) {
let is_important = matches!(toks.peek_next(), Some(Token { kind: 'i', .. }) | Some(Token { kind: 'I', .. }) | Some(Token { kind: '=', .. })); let is_important = matches!(
toks.peek_next(),
Some(Token { kind: 'i', .. })
| Some(Token { kind: 'I', .. })
| Some(Token { kind: '=', .. })
);
toks.reset_cursor(); toks.reset_cursor();
!is_important !is_important
} else { } else {

9
src/selector/extend/functions.rs
View File

@ -761,5 +761,12 @@ fn must_unify(
/// Returns whether a `CompoundSelector` may contain only one simple selector of /// Returns whether a `CompoundSelector` may contain only one simple selector of
/// the same type as `simple`. /// the same type as `simple`.
fn is_unique(simple: &SimpleSelector) -> bool { fn is_unique(simple: &SimpleSelector) -> bool {
matches!(simple, SimpleSelector::Id(..) | SimpleSelector::Pseudo(Pseudo { is_class: false, .. })) matches!(
simple,
SimpleSelector::Id(..)
| SimpleSelector::Pseudo(Pseudo {
is_class: false,
..
})
)
} }