From ff0b05d74aee53b67c628cb3cfcc33afdd138c94 Mon Sep 17 00:00:00 2001 From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com> Date: Sun, 16 Feb 2020 10:08:45 -0500 Subject: [PATCH] Refactor SassError to live inside error module --- src/css.rs | 3 ++- src/error.rs | 2 ++ src/format.rs | 3 ++- src/imports.rs | 3 ++- src/lib.rs | 4 +--- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/css.rs b/src/css.rs index 7776d91..e6a1cd7 100644 --- a/src/css.rs +++ b/src/css.rs @@ -1,6 +1,7 @@ //! # Convert from SCSS AST to CSS use crate::atrule::AtRule; -use crate::{RuleSet, SassResult, Selector, Stmt, Style, StyleSheet}; +use crate::error::SassResult; +use crate::{RuleSet, Selector, Stmt, Style, StyleSheet}; use std::fmt; use std::io::Write; diff --git a/src/error.rs b/src/error.rs index ec37bcd..96d4e15 100644 --- a/src/error.rs +++ b/src/error.rs @@ -4,6 +4,8 @@ use std::fmt::{self, Display}; use std::io; use std::string::FromUtf8Error; +pub type SassResult = Result; + #[derive(Debug)] pub struct SassError { message: String, diff --git a/src/format.rs b/src/format.rs index 5c42d88..503ff6d 100644 --- a/src/format.rs +++ b/src/format.rs @@ -1,6 +1,7 @@ use std::fmt::Write; -use crate::{RuleSet, SassResult, Stmt, StyleSheet}; +use crate::error::SassResult; +use crate::{RuleSet, Stmt, StyleSheet}; pub(crate) struct PrettyPrinter { buf: W, diff --git a/src/imports.rs b/src/imports.rs index 9db5997..3cae2e6 100644 --- a/src/imports.rs +++ b/src/imports.rs @@ -1,5 +1,6 @@ use crate::common::Scope; -use crate::{SassResult, Stmt, StyleSheet}; +use crate::error::SassResult; +use crate::{Stmt, StyleSheet}; use std::ffi::OsStr; use std::path::Path; diff --git a/src/lib.rs b/src/lib.rs index 5b9da65..42dbf96 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -59,7 +59,7 @@ use std::path::Path; use crate::atrule::{AtRule, AtRuleKind}; use crate::common::{Keyword, Op, Pos, Scope, Symbol, Whitespace}; use crate::css::Css; -use crate::error::SassError; +use crate::error::{SassError, SassResult}; use crate::format::PrettyPrinter; use crate::function::Function; use crate::imports::import; @@ -88,8 +88,6 @@ mod units; mod utils; mod value; -pub type SassResult = Result; - #[derive(Clone, Debug, Eq, PartialEq)] pub(crate) struct Token { pos: Pos,