prettify imports
This commit is contained in:
parent
71dd7df951
commit
c1b5ff5730
10
src/args.rs
10
src/args.rs
@ -2,10 +2,12 @@ use std::collections::HashMap;
|
||||
|
||||
use codemap::{Span, Spanned};
|
||||
|
||||
use crate::common::Identifier;
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::{Cow, Token};
|
||||
use crate::{
|
||||
common::Identifier,
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
{Cow, Token},
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone, Eq, PartialEq)]
|
||||
pub(crate) struct FuncArgs(pub Vec<FuncArg>);
|
||||
|
@ -1,8 +1,6 @@
|
||||
use codemap::Span;
|
||||
|
||||
use crate::args::FuncArgs;
|
||||
use crate::scope::Scope;
|
||||
use crate::Token;
|
||||
use crate::{args::FuncArgs, scope::Scope, Token};
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub(crate) struct Function {
|
||||
|
@ -2,9 +2,7 @@ use std::vec::IntoIter;
|
||||
|
||||
use peekmore::{PeekMore, PeekMoreIterator};
|
||||
|
||||
use crate::args::FuncArgs;
|
||||
use crate::scope::Scope;
|
||||
use crate::Token;
|
||||
use crate::{args::FuncArgs, scope::Scope, Token};
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub(crate) struct Mixin {
|
||||
|
@ -2,13 +2,15 @@ use super::{Builtin, GlobalFunctionMap};
|
||||
|
||||
use num_traits::One;
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::color::Color;
|
||||
use crate::common::QuoteKind;
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::unit::Unit;
|
||||
use crate::value::{Number, Value};
|
||||
use crate::{
|
||||
args::CallArgs,
|
||||
color::Color,
|
||||
common::QuoteKind,
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
unit::Unit,
|
||||
value::{Number, Value},
|
||||
};
|
||||
|
||||
fn inner_hsl(name: &'static str, mut args: CallArgs, parser: &mut Parser<'_>) -> SassResult<Value> {
|
||||
if args.is_empty() {
|
||||
|
@ -1,12 +1,9 @@
|
||||
use super::{Builtin, GlobalFunctionMap};
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::common::QuoteKind;
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::unit::Unit;
|
||||
use crate::value::Number;
|
||||
use crate::value::Value;
|
||||
use crate::{
|
||||
args::CallArgs, common::QuoteKind, error::SassResult, parse::Parser, unit::Unit, value::Number,
|
||||
value::Value,
|
||||
};
|
||||
|
||||
fn alpha(mut args: CallArgs, parser: &mut Parser<'_>) -> SassResult<Value> {
|
||||
args.max_args(1)?;
|
||||
|
@ -2,13 +2,15 @@ use super::{Builtin, GlobalFunctionMap};
|
||||
|
||||
use num_traits::{One, Signed, Zero};
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::color::Color;
|
||||
use crate::common::QuoteKind;
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::unit::Unit;
|
||||
use crate::value::{Number, Value};
|
||||
use crate::{
|
||||
args::CallArgs,
|
||||
color::Color,
|
||||
common::QuoteKind,
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
unit::Unit,
|
||||
value::{Number, Value},
|
||||
};
|
||||
|
||||
macro_rules! opt_rgba {
|
||||
($args:ident, $name:ident, $arg:literal, $low:literal, $high:literal, $parser:ident) => {
|
||||
|
@ -2,13 +2,15 @@ use super::{Builtin, GlobalFunctionMap};
|
||||
|
||||
use num_traits::One;
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::color::Color;
|
||||
use crate::common::QuoteKind;
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::unit::Unit;
|
||||
use crate::value::{Number, Value};
|
||||
use crate::{
|
||||
args::CallArgs,
|
||||
color::Color,
|
||||
common::QuoteKind,
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
unit::Unit,
|
||||
value::{Number, Value},
|
||||
};
|
||||
|
||||
/// name: Either `rgb` or `rgba` depending on the caller
|
||||
// todo: refactor into smaller functions
|
||||
|
@ -2,12 +2,14 @@ use super::{Builtin, GlobalFunctionMap};
|
||||
|
||||
use num_traits::{One, Signed, ToPrimitive, Zero};
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::common::{Brackets, ListSeparator, QuoteKind};
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::unit::Unit;
|
||||
use crate::value::{Number, Value};
|
||||
use crate::{
|
||||
args::CallArgs,
|
||||
common::{Brackets, ListSeparator, QuoteKind},
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
unit::Unit,
|
||||
value::{Number, Value},
|
||||
};
|
||||
|
||||
fn length(mut args: CallArgs, parser: &mut Parser<'_>) -> SassResult<Value> {
|
||||
args.max_args(1)?;
|
||||
|
@ -1,10 +1,12 @@
|
||||
use super::{Builtin, GlobalFunctionMap};
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::common::{Brackets, ListSeparator};
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::value::{SassMap, Value};
|
||||
use crate::{
|
||||
args::CallArgs,
|
||||
common::{Brackets, ListSeparator},
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
value::{SassMap, Value},
|
||||
};
|
||||
|
||||
fn map_get(mut args: CallArgs, parser: &mut Parser<'_>) -> SassResult<Value> {
|
||||
args.max_args(2)?;
|
||||
|
@ -5,11 +5,13 @@ use num_traits::{One, Signed, ToPrimitive, Zero};
|
||||
#[cfg(feature = "random")]
|
||||
use rand::Rng;
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::unit::Unit;
|
||||
use crate::value::{Number, Value};
|
||||
use crate::{
|
||||
args::CallArgs,
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
unit::Unit,
|
||||
value::{Number, Value},
|
||||
};
|
||||
|
||||
fn percentage(mut args: CallArgs, parser: &mut Parser<'_>) -> SassResult<Value> {
|
||||
args.max_args(1)?;
|
||||
|
@ -2,12 +2,14 @@ use super::{Builtin, GlobalFunctionMap, GLOBAL_FUNCTIONS};
|
||||
|
||||
use codemap::Spanned;
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::common::QuoteKind;
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::unit::Unit;
|
||||
use crate::value::{SassFunction, Value};
|
||||
use crate::{
|
||||
args::CallArgs,
|
||||
common::QuoteKind,
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
unit::Unit,
|
||||
value::{SassFunction, Value},
|
||||
};
|
||||
|
||||
fn if_(mut args: CallArgs, parser: &mut Parser<'_>) -> SassResult<Value> {
|
||||
args.max_args(3)?;
|
||||
|
@ -1,11 +1,11 @@
|
||||
use once_cell::sync::Lazy;
|
||||
use std::collections::HashMap;
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
sync::atomic::{AtomicUsize, Ordering},
|
||||
};
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::value::Value;
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
use crate::{args::CallArgs, error::SassResult, parse::Parser, value::Value};
|
||||
|
||||
#[macro_use]
|
||||
mod macros;
|
||||
|
@ -1,13 +1,13 @@
|
||||
use super::{Builtin, GlobalFunctionMap};
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::common::{Brackets, ListSeparator, QuoteKind};
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::selector::{
|
||||
ComplexSelector, ComplexSelectorComponent, Extender, Selector, SelectorList,
|
||||
use crate::{
|
||||
args::CallArgs,
|
||||
common::{Brackets, ListSeparator, QuoteKind},
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
selector::{ComplexSelector, ComplexSelectorComponent, Extender, Selector, SelectorList},
|
||||
value::Value,
|
||||
};
|
||||
use crate::value::Value;
|
||||
|
||||
fn is_superselector(mut args: CallArgs, parser: &mut Parser<'_>) -> SassResult<Value> {
|
||||
args.max_args(2)?;
|
||||
|
@ -6,12 +6,14 @@ use num_traits::{Signed, ToPrimitive, Zero};
|
||||
#[cfg(feature = "random")]
|
||||
use rand::{distributions::Alphanumeric, thread_rng, Rng};
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::common::QuoteKind;
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::unit::Unit;
|
||||
use crate::value::{Number, Value};
|
||||
use crate::{
|
||||
args::CallArgs,
|
||||
common::QuoteKind,
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
unit::Unit,
|
||||
value::{Number, Value},
|
||||
};
|
||||
|
||||
fn to_upper_case(mut args: CallArgs, parser: &mut Parser<'_>) -> SassResult<Value> {
|
||||
args.max_args(1)?;
|
||||
|
@ -15,8 +15,10 @@
|
||||
//! Named colors retain their original casing,
|
||||
//! so `rEd` should be emitted as `rEd`.
|
||||
|
||||
use std::cmp::{max, min};
|
||||
use std::fmt::{self, Display};
|
||||
use std::{
|
||||
cmp::{max, min},
|
||||
fmt::{self, Display},
|
||||
};
|
||||
|
||||
use crate::value::Number;
|
||||
pub(crate) use name::NAMED_COLORS;
|
||||
|
10
src/error.rs
10
src/error.rs
@ -1,7 +1,9 @@
|
||||
use std::error::Error;
|
||||
use std::fmt::{self, Display};
|
||||
use std::io;
|
||||
use std::string::FromUtf8Error;
|
||||
use std::{
|
||||
error::Error,
|
||||
fmt::{self, Display},
|
||||
io,
|
||||
string::FromUtf8Error,
|
||||
};
|
||||
|
||||
use codemap::{Span, SpanLoc};
|
||||
|
||||
|
@ -1,6 +1,4 @@
|
||||
use std::iter::Peekable;
|
||||
use std::str::Chars;
|
||||
use std::sync::Arc;
|
||||
use std::{iter::Peekable, str::Chars, sync::Arc};
|
||||
|
||||
use codemap::File;
|
||||
|
||||
|
@ -1,5 +1,7 @@
|
||||
use std::fs::File;
|
||||
use std::io::{stdout, BufWriter, Write};
|
||||
use std::{
|
||||
fs::File,
|
||||
io::{stdout, BufWriter, Write},
|
||||
};
|
||||
|
||||
use clap::{arg_enum, App, Arg};
|
||||
|
||||
|
@ -3,10 +3,7 @@ use std::io::Write;
|
||||
|
||||
use codemap::CodeMap;
|
||||
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Stmt;
|
||||
use crate::selector::Selector;
|
||||
use crate::style::Style;
|
||||
use crate::{error::SassResult, parse::Stmt, selector::Selector, style::Style};
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
enum Toplevel {
|
||||
|
@ -1,15 +1,14 @@
|
||||
use std::collections::HashMap;
|
||||
use std::mem;
|
||||
use std::{collections::HashMap, mem};
|
||||
|
||||
use codemap::{Span, Spanned};
|
||||
|
||||
use crate::args::{CallArg, CallArgs, FuncArg, FuncArgs};
|
||||
use crate::error::SassResult;
|
||||
use crate::utils::{
|
||||
read_until_closing_paren, read_until_closing_quote, read_until_closing_square_brace,
|
||||
use crate::{
|
||||
args::{CallArg, CallArgs, FuncArg, FuncArgs},
|
||||
error::SassResult,
|
||||
utils::{read_until_closing_paren, read_until_closing_quote, read_until_closing_square_brace},
|
||||
value::Value,
|
||||
Token,
|
||||
};
|
||||
use crate::value::Value;
|
||||
use crate::Token;
|
||||
|
||||
use super::Parser;
|
||||
|
||||
|
@ -1,13 +1,14 @@
|
||||
use std::borrow::Borrow;
|
||||
use std::iter::Iterator;
|
||||
use std::{borrow::Borrow, iter::Iterator};
|
||||
|
||||
use codemap::Spanned;
|
||||
|
||||
use crate::common::QuoteKind;
|
||||
use crate::error::SassResult;
|
||||
use crate::utils::{as_hex, hex_char_for, is_name, is_name_start};
|
||||
use crate::value::Value;
|
||||
use crate::Token;
|
||||
use crate::{
|
||||
common::QuoteKind,
|
||||
error::SassResult,
|
||||
utils::{as_hex, hex_char_for, is_name, is_name_start},
|
||||
value::Value,
|
||||
Token,
|
||||
};
|
||||
|
||||
use super::Parser;
|
||||
|
||||
|
@ -10,22 +10,24 @@ use codemap::{CodeMap, Span, Spanned};
|
||||
use num_traits::cast::ToPrimitive;
|
||||
use peekmore::{PeekMore, PeekMoreIterator};
|
||||
|
||||
use crate::args::{CallArgs, FuncArgs};
|
||||
use crate::atrule::{AtRuleKind, Function, Mixin};
|
||||
use crate::common::{Brackets, Identifier, ListSeparator};
|
||||
use crate::error::SassResult;
|
||||
use crate::lexer::Lexer;
|
||||
use crate::scope::Scope;
|
||||
use crate::selector::{Selector, SelectorParser};
|
||||
use crate::style::Style;
|
||||
use crate::unit::Unit;
|
||||
use crate::utils::{
|
||||
use crate::{
|
||||
args::{CallArgs, FuncArgs},
|
||||
atrule::{AtRuleKind, Function, Mixin},
|
||||
common::{Brackets, Identifier, ListSeparator},
|
||||
error::SassResult,
|
||||
lexer::Lexer,
|
||||
scope::Scope,
|
||||
selector::{Selector, SelectorParser},
|
||||
style::Style,
|
||||
unit::Unit,
|
||||
utils::{
|
||||
is_name, is_name_start, peek_ident_no_interpolation, read_until_closing_curly_brace,
|
||||
read_until_closing_paren, read_until_closing_quote, read_until_newline,
|
||||
read_until_open_curly_brace, read_until_semicolon_or_closing_curly_brace,
|
||||
},
|
||||
value::{Number, Value},
|
||||
{Cow, Token},
|
||||
};
|
||||
use crate::value::{Number, Value};
|
||||
use crate::{Cow, Token};
|
||||
|
||||
use common::{Branch, NeverEmptyVec, SelectorOrStyle};
|
||||
|
||||
|
@ -1,6 +1,4 @@
|
||||
use std::borrow::Borrow;
|
||||
use std::iter::Iterator;
|
||||
use std::mem;
|
||||
use std::{borrow::Borrow, iter::Iterator, mem};
|
||||
|
||||
use num_bigint::BigInt;
|
||||
use num_rational::{BigRational, Rational64};
|
||||
@ -10,19 +8,21 @@ use codemap::{Span, Spanned};
|
||||
|
||||
use peekmore::PeekMore;
|
||||
|
||||
use crate::builtin::GLOBAL_FUNCTIONS;
|
||||
use crate::color::{Color, NAMED_COLORS};
|
||||
use crate::common::{Brackets, Identifier, ListSeparator, Op, QuoteKind};
|
||||
use crate::error::SassResult;
|
||||
use crate::unit::Unit;
|
||||
use crate::utils::{
|
||||
as_hex, devour_whitespace, eat_number, hex_char_for, is_name, peek_until_closing_curly_brace,
|
||||
peek_whitespace, read_until_char, read_until_closing_paren, read_until_closing_square_brace,
|
||||
IsWhitespace,
|
||||
use crate::{
|
||||
builtin::GLOBAL_FUNCTIONS,
|
||||
color::{Color, NAMED_COLORS},
|
||||
common::{Brackets, Identifier, ListSeparator, Op, QuoteKind},
|
||||
error::SassResult,
|
||||
unit::Unit,
|
||||
utils::{
|
||||
as_hex, devour_whitespace, eat_number, hex_char_for, is_name,
|
||||
peek_until_closing_curly_brace, peek_whitespace, read_until_char, read_until_closing_paren,
|
||||
read_until_closing_square_brace, IsWhitespace,
|
||||
},
|
||||
value::Value,
|
||||
value::{Number, SassMap},
|
||||
Token,
|
||||
};
|
||||
use crate::value::Value;
|
||||
use crate::value::{Number, SassMap};
|
||||
use crate::Token;
|
||||
|
||||
use super::Parser;
|
||||
|
||||
|
12
src/scope.rs
12
src/scope.rs
@ -2,11 +2,13 @@ use std::collections::HashMap;
|
||||
|
||||
use codemap::Spanned;
|
||||
|
||||
use crate::atrule::{Function, Mixin};
|
||||
use crate::builtin::GLOBAL_FUNCTIONS;
|
||||
use crate::common::Identifier;
|
||||
use crate::error::SassResult;
|
||||
use crate::value::Value;
|
||||
use crate::{
|
||||
atrule::{Function, Mixin},
|
||||
builtin::GLOBAL_FUNCTIONS,
|
||||
common::Identifier,
|
||||
error::SassResult,
|
||||
value::Value,
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone, Default)]
|
||||
pub(crate) struct Scope {
|
||||
|
@ -2,12 +2,9 @@ use std::fmt::{self, Display, Write};
|
||||
|
||||
use codemap::Span;
|
||||
|
||||
use crate::{common::QuoteKind, error::SassResult, parse::Parser, utils::is_ident, value::Value};
|
||||
|
||||
use super::{Namespace, QualifiedName};
|
||||
use crate::common::QuoteKind;
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::utils::is_ident;
|
||||
use crate::value::Value;
|
||||
|
||||
#[derive(Clone, Debug, Eq, PartialEq, Hash)]
|
||||
pub(crate) struct Attribute {
|
||||
|
@ -1,4 +1,4 @@
|
||||
use std::fmt::{self, Display};
|
||||
use std::fmt;
|
||||
|
||||
/// The selector namespace.
|
||||
///
|
||||
@ -14,7 +14,7 @@ pub(crate) enum Namespace {
|
||||
None,
|
||||
}
|
||||
|
||||
impl Display for Namespace {
|
||||
impl fmt::Display for Namespace {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
match self {
|
||||
Self::Empty => write!(f, "|"),
|
||||
@ -31,7 +31,7 @@ pub(crate) struct QualifiedName {
|
||||
pub namespace: Namespace,
|
||||
}
|
||||
|
||||
impl Display for QualifiedName {
|
||||
impl fmt::Display for QualifiedName {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "{}", self.namespace)?;
|
||||
f.write_str(&self.ident)
|
||||
|
@ -1,6 +1,7 @@
|
||||
use super::{CompoundSelector, Pseudo, SelectorList, SimpleSelector, Specificity};
|
||||
use std::fmt::{self, Display, Write};
|
||||
|
||||
use super::{CompoundSelector, Pseudo, SelectorList, SimpleSelector, Specificity};
|
||||
|
||||
/// A complex selector.
|
||||
///
|
||||
/// A complex selector is composed of `CompoundSelector`s separated by
|
||||
|
@ -1,13 +1,15 @@
|
||||
use std::collections::VecDeque;
|
||||
use std::{
|
||||
collections::VecDeque,
|
||||
fmt::{self, Write},
|
||||
mem,
|
||||
};
|
||||
|
||||
use super::{unify_complex, ComplexSelector, ComplexSelectorComponent};
|
||||
|
||||
use crate::common::{Brackets, ListSeparator, QuoteKind};
|
||||
use crate::value::Value;
|
||||
use crate::{
|
||||
common::{Brackets, ListSeparator, QuoteKind},
|
||||
value::Value,
|
||||
};
|
||||
|
||||
/// A selector list.
|
||||
///
|
||||
|
@ -1,4 +1,4 @@
|
||||
use std::fmt::{self, Display};
|
||||
use std::fmt;
|
||||
|
||||
use crate::value::Value;
|
||||
|
||||
@ -23,7 +23,7 @@ mod simple;
|
||||
#[derive(Clone, Debug, Eq, PartialEq)]
|
||||
pub(crate) struct Selector(pub SelectorList);
|
||||
|
||||
impl Display for Selector {
|
||||
impl fmt::Display for Selector {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "{}", self.0)
|
||||
}
|
||||
|
@ -1,13 +1,16 @@
|
||||
use codemap::Span;
|
||||
|
||||
use crate::{
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
utils::{devour_whitespace, is_name, is_name_start, read_until_closing_paren},
|
||||
Token,
|
||||
};
|
||||
|
||||
use super::{
|
||||
Attribute, Combinator, ComplexSelector, ComplexSelectorComponent, CompoundSelector, Namespace,
|
||||
Pseudo, QualifiedName, SelectorList, SimpleSelector,
|
||||
};
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::utils::{devour_whitespace, is_name, is_name_start, read_until_closing_paren};
|
||||
use crate::Token;
|
||||
|
||||
#[derive(PartialEq)]
|
||||
enum DevouredWhitespace {
|
||||
|
@ -1,7 +1,6 @@
|
||||
use codemap::Spanned;
|
||||
|
||||
use crate::error::SassResult;
|
||||
use crate::value::Value;
|
||||
use crate::{error::SassResult, value::Value};
|
||||
|
||||
/// A style: `color: red`
|
||||
#[derive(Clone, Debug, Eq, PartialEq)]
|
||||
|
@ -2,8 +2,7 @@
|
||||
//!
|
||||
//! Arbitrary precision is retained.
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::f64::consts::PI;
|
||||
use std::{collections::HashMap, f64::consts::PI};
|
||||
|
||||
use num_traits::One;
|
||||
use once_cell::sync::Lazy;
|
||||
|
@ -1,12 +1,8 @@
|
||||
use std::iter::Iterator;
|
||||
|
||||
use peekmore::PeekMoreIterator;
|
||||
|
||||
use crate::{error::SassResult, Token};
|
||||
|
||||
use super::read_until_closing_quote;
|
||||
|
||||
use crate::error::SassResult;
|
||||
use crate::Token;
|
||||
|
||||
/// Reads until the char is found, consuming the char,
|
||||
/// or until the end of the iterator is hit
|
||||
pub(crate) fn read_until_char<I: Iterator<Item = Token>>(
|
||||
|
@ -1,11 +1,8 @@
|
||||
use std::iter::Iterator;
|
||||
|
||||
use codemap::Spanned;
|
||||
|
||||
use peekmore::PeekMoreIterator;
|
||||
|
||||
use crate::error::SassResult;
|
||||
use crate::Token;
|
||||
use crate::{error::SassResult, Token};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct ParsedNumber {
|
||||
|
@ -1,11 +1,8 @@
|
||||
use std::iter::Iterator;
|
||||
|
||||
use codemap::{Span, Spanned};
|
||||
|
||||
use peekmore::PeekMoreIterator;
|
||||
|
||||
use crate::error::SassResult;
|
||||
use crate::Token;
|
||||
use crate::{error::SassResult, Token};
|
||||
|
||||
use super::{as_hex, hex_char_for, is_name, is_name_start, IsWhitespace};
|
||||
|
||||
|
@ -2,8 +2,7 @@ use std::iter::Iterator;
|
||||
|
||||
use peekmore::PeekMoreIterator;
|
||||
|
||||
use crate::error::SassResult;
|
||||
use crate::Token;
|
||||
use crate::{error::SassResult, Token};
|
||||
|
||||
use super::{devour_whitespace, read_until_newline};
|
||||
|
||||
|
@ -1,11 +1,12 @@
|
||||
use std::slice::Iter;
|
||||
use std::vec::IntoIter;
|
||||
use std::{slice::Iter, vec::IntoIter};
|
||||
|
||||
use codemap::Span;
|
||||
|
||||
use super::Value;
|
||||
use crate::common::{Brackets, ListSeparator};
|
||||
use crate::error::SassResult;
|
||||
use crate::{
|
||||
common::{Brackets, ListSeparator},
|
||||
error::SassResult,
|
||||
value::Value,
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub(crate) struct SassMap(Vec<(Value, Value)>);
|
||||
|
@ -1,17 +1,17 @@
|
||||
use std::iter::Iterator;
|
||||
|
||||
use peekmore::PeekMore;
|
||||
|
||||
use codemap::{Span, Spanned};
|
||||
|
||||
use crate::color::Color;
|
||||
use crate::common::{Brackets, ListSeparator, Op, QuoteKind};
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::selector::Selector;
|
||||
use crate::unit::Unit;
|
||||
use crate::utils::hex_char_for;
|
||||
use crate::{Cow, Token};
|
||||
use crate::{
|
||||
color::Color,
|
||||
common::{Brackets, ListSeparator, Op, QuoteKind},
|
||||
error::SassResult,
|
||||
parse::Parser,
|
||||
selector::Selector,
|
||||
unit::Unit,
|
||||
utils::hex_char_for,
|
||||
{Cow, Token},
|
||||
};
|
||||
|
||||
use css_function::is_special_function;
|
||||
pub(crate) use map::SassMap;
|
||||
|
@ -1,6 +1,8 @@
|
||||
use std::fmt::{self, Display, UpperHex};
|
||||
use std::mem;
|
||||
use std::ops::{Add, AddAssign};
|
||||
use std::{
|
||||
fmt::{self, Display, UpperHex},
|
||||
mem,
|
||||
ops::{Add, AddAssign},
|
||||
};
|
||||
|
||||
use num_bigint::BigInt;
|
||||
use num_traits::{Signed, ToPrimitive, Zero};
|
||||
|
@ -1,9 +1,9 @@
|
||||
use std::cmp::Ordering;
|
||||
use std::convert::{From, TryFrom};
|
||||
use std::fmt::{self, Display, Write};
|
||||
use std::mem;
|
||||
use std::ops::{
|
||||
Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Rem, RemAssign, Sub, SubAssign,
|
||||
use std::{
|
||||
cmp::Ordering,
|
||||
convert::{From, TryFrom},
|
||||
fmt::{self, Display, Write},
|
||||
mem,
|
||||
ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Rem, RemAssign, Sub, SubAssign},
|
||||
};
|
||||
|
||||
use num_bigint::BigInt;
|
||||
|
@ -2,10 +2,12 @@ use std::cmp::Ordering;
|
||||
|
||||
use codemap::{Span, Spanned};
|
||||
|
||||
use crate::common::{Op, QuoteKind};
|
||||
use crate::error::SassResult;
|
||||
use crate::unit::{Unit, UNIT_CONVERSION_TABLE};
|
||||
use crate::value::Value;
|
||||
use crate::{
|
||||
common::{Op, QuoteKind},
|
||||
error::SassResult,
|
||||
unit::{Unit, UNIT_CONVERSION_TABLE},
|
||||
value::Value,
|
||||
};
|
||||
|
||||
impl Value {
|
||||
pub fn equals(mut self, mut other: Value, span: Span) -> SassResult<Spanned<Value>> {
|
||||
|
@ -11,13 +11,10 @@
|
||||
|
||||
use std::fmt;
|
||||
|
||||
use crate::args::CallArgs;
|
||||
use crate::atrule::Function;
|
||||
use crate::builtin::Builtin;
|
||||
use crate::common::Identifier;
|
||||
use crate::error::SassResult;
|
||||
use crate::parse::Parser;
|
||||
use crate::value::Value;
|
||||
use crate::{
|
||||
args::CallArgs, atrule::Function, builtin::Builtin, common::Identifier, error::SassResult,
|
||||
parse::Parser, value::Value,
|
||||
};
|
||||
|
||||
/// A SASS function
|
||||
///
|
||||
|
Loading…
x
Reference in New Issue
Block a user