fix CI, rustfmt

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: nightly
           override: true
 
       - name: version info

CHANGELOG.md

@@ -8,6 +8,7 @@
 # 0.12.1 (unreleased)
 
 - add `grass::include!` macro to make it easier to include CSS at compile time
+- various optimizations improving the bootstrap benchmark by ~30% and the bulma benchmark by ~15%
 - improve error message for complex units in calculations
 - more accurate formatting of named arguments in arglists when passed to `inspect(..)`
 - more accurate formatting of nested lists with different separators when passed to `inspect(..)`

grass_internal/src/builtin/mod.rs

@@ -27,8 +27,8 @@ mod builtin_imports {
     };
 
     pub(crate) use std::{
-        sync::Arc,
         cmp::Ordering,
         collections::{BTreeMap, BTreeSet},
+        sync::Arc,
     };
 }

grass_internal/src/parse/css.rs

@@ -203,17 +203,19 @@ impl<'a> CssParser<'a> {
             return Err(("This function isn't allowed in plain CSS.", span).into());
         }
 
-        Ok(AstExpr::InterpolatedFunction(Arc::new(InterpolatedFunction {
+        Ok(
-            name: identifier,
+            AstExpr::InterpolatedFunction(Arc::new(InterpolatedFunction {
-            arguments: ArgumentInvocation {
+                name: identifier,
-                positional: arguments,
+                arguments: ArgumentInvocation {
-                named: BTreeMap::new(),
+                    positional: arguments,
-                rest: None,
+                    named: BTreeMap::new(),
-                keyword_rest: None,
+                    rest: None,
-                span: self.toks.span_from(before_args),
+                    keyword_rest: None,
-            },
+                    span: self.toks.span_from(before_args),
-            span,
+                },
-        }))
+                span,
-        .span(span))
+            }))
+            .span(span),
+        )
     }
 }

grass_internal/src/parse/sass.rs

@@ -2,7 +2,7 @@ use std::path::Path;
 
 use codemap::{CodeMap, Span};
 
-use crate::{ast::*, error::SassResult, lexer::Lexer, Token, ContextFlags, Options};
+use crate::{ast::*, error::SassResult, lexer::Lexer, ContextFlags, Options, Token};
 
 use super::{BaseParser, StylesheetParser};