diff --git a/src/function.rs b/src/atrule/function.rs similarity index 100% rename from src/function.rs rename to src/atrule/function.rs diff --git a/src/mixin.rs b/src/atrule/mixin.rs similarity index 100% rename from src/mixin.rs rename to src/atrule/mixin.rs diff --git a/src/atrule/mod.rs b/src/atrule/mod.rs index 3f7a0d5..339424f 100644 --- a/src/atrule/mod.rs +++ b/src/atrule/mod.rs @@ -3,10 +3,10 @@ use std::iter::Peekable; use num_traits::cast::ToPrimitive; +pub(crate) use function::Function; +pub(crate) use mixin::{eat_include, Mixin}; use crate::common::{Keyword, Pos, Symbol}; use crate::error::SassResult; -use crate::function::Function; -use crate::mixin::Mixin; use crate::scope::Scope; use crate::selector::Selector; use crate::unit::Unit; @@ -17,7 +17,9 @@ use crate::{Stmt, Token, TokenKind}; use parse::eat_stmts; use unknown::UnknownAtRule; +mod function; mod parse; +mod mixin; mod unknown; #[derive(Debug, Clone)] diff --git a/src/lib.rs b/src/lib.rs index e0b566c..65e5e62 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -84,16 +84,14 @@ use std::io::Write; use std::iter::{Iterator, Peekable}; use std::path::Path; -use crate::atrule::{AtRule, AtRuleKind}; +use crate::atrule::{AtRule, AtRuleKind, eat_include, Mixin, Function}; use crate::common::{Pos, Symbol, Whitespace}; use crate::css::Css; use crate::error::SassError; pub use crate::error::SassResult; use crate::format::PrettyPrinter; -use crate::function::Function; use crate::imports::import; use crate::lexer::Lexer; -use crate::mixin::{eat_include, Mixin}; use crate::scope::{insert_global_var, Scope, GLOBAL_SCOPE}; use crate::selector::Selector; use crate::style::Style; @@ -109,10 +107,8 @@ mod common; mod css; mod error; mod format; -mod function; mod imports; mod lexer; -mod mixin; mod scope; mod selector; mod style; diff --git a/src/scope.rs b/src/scope.rs index c8bd986..ac7d0e8 100644 --- a/src/scope.rs +++ b/src/scope.rs @@ -2,8 +2,7 @@ use std::cell::RefCell; use std::collections::HashMap; use crate::error::SassResult; -use crate::function::Function; -use crate::mixin::Mixin; +use crate::atrule::{Function, Mixin}; use crate::value::Value; thread_local!(pub(crate) static GLOBAL_SCOPE: RefCell = RefCell::new(Scope::new()));