fix(compiler): Reduce scope of API

cobalt-org · Dec 12, 2018 · d8d6f66 · d8d6f66
1 parent 1328e13
commit d8d6f66
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/liquid-compiler/src/block.rs b/liquid-compiler/src/block.rs
@@ -1,6 +1,6 @@
+use liquid_error::Result;
 use liquid_interpreter::Renderable;
 
-use super::error::Result;
 use super::LiquidOptions;
 use super::TagBlock;
 use super::TagTokenIter;

diff --git a/liquid-compiler/src/include.rs b/liquid-compiler/src/include.rs
@@ -2,7 +2,7 @@ use std::fs::File;
 use std::io::prelude::Read;
 use std::path;
 
-use super::error::{Error, Result, ResultLiquidChainExt, ResultLiquidExt};
+use liquid_error::{Error, Result, ResultLiquidChainExt, ResultLiquidExt};
 
 pub trait Include: Send + Sync + IncludeClone {
     fn include(&self, path: &str) -> Result<String>;

diff --git a/liquid-compiler/src/lib.rs b/liquid-compiler/src/lib.rs
@@ -13,14 +13,6 @@ mod parser;
 mod tag;
 mod text;
 
-pub mod error {
-    pub use liquid_error::*;
-}
-
-pub mod value {
-    pub use liquid_value::*;
-}
-
 pub use block::*;
 pub use include::*;
 pub use options::*;

diff --git a/liquid-compiler/src/parser.rs b/liquid-compiler/src/parser.rs
@@ -5,14 +5,14 @@
 
 use std;
 
+use liquid_error::{Error, Result};
 use liquid_interpreter::Expression;
 use liquid_interpreter::Renderable;
 use liquid_interpreter::Variable;
 use liquid_interpreter::{FilterCall, FilterChain};
 use liquid_value::Scalar;
 use liquid_value::Value;
 
-use super::error::{Error, Result};
 use super::LiquidOptions;
 use super::ParseBlock;
 use super::ParseTag;

diff --git a/liquid-compiler/src/tag.rs b/liquid-compiler/src/tag.rs
@@ -1,6 +1,6 @@
+use liquid_error::Result;
 use liquid_interpreter::Renderable;
 
-use super::error::Result;
 use super::LiquidOptions;
 use super::TagTokenIter;
 

diff --git a/liquid-compiler/src/text.rs b/liquid-compiler/src/text.rs
@@ -1,6 +1,6 @@
 use std::io::Write;
 
-use error::{Result, ResultLiquidChainExt};
+use liquid_error::{Result, ResultLiquidChainExt};
 use liquid_interpreter::Context;
 use liquid_interpreter::Renderable;