From d88ac86bd1606585b96fc213dbd2ea7f57cc600a Mon Sep 17 00:00:00 2001
From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com>
Date: Mon, 18 May 2020 11:50:40 -0400
Subject: [PATCH] consolidate builtin imports

---
 src/builtin/color/hsl.rs     | 3 +--
 src/builtin/color/mod.rs     | 4 +---
 src/builtin/color/opacity.rs | 3 +--
 src/builtin/color/other.rs   | 3 +--
 src/builtin/color/rgb.rs     | 3 +--
 src/builtin/list.rs          | 3 +--
 src/builtin/map.rs           | 3 +--
 src/builtin/math.rs          | 3 +--
 src/builtin/meta.rs          | 3 +--
 src/builtin/string.rs        | 3 +--
 10 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/builtin/color/hsl.rs b/src/builtin/color/hsl.rs
index c93468b..dca421a 100644
--- a/src/builtin/color/hsl.rs
+++ b/src/builtin/color/hsl.rs
@@ -1,8 +1,7 @@
-use super::GlobalFunctionMap;
+use super::{Builtin, GlobalFunctionMap};
 
 use num_traits::One;
 
-use super::Builtin;
 use crate::args::CallArgs;
 use crate::color::Color;
 use crate::common::QuoteKind;
diff --git a/src/builtin/color/mod.rs b/src/builtin/color/mod.rs
index 7b3ce11..42bb71d 100644
--- a/src/builtin/color/mod.rs
+++ b/src/builtin/color/mod.rs
@@ -1,6 +1,4 @@
-use super::GlobalFunctionMap;
-
-use super::Builtin;
+use super::{Builtin, GlobalFunctionMap};
 
 mod hsl;
 mod opacity;
diff --git a/src/builtin/color/opacity.rs b/src/builtin/color/opacity.rs
index 0b17c5a..1b2e25d 100644
--- a/src/builtin/color/opacity.rs
+++ b/src/builtin/color/opacity.rs
@@ -1,6 +1,5 @@
-use super::GlobalFunctionMap;
+use super::{Builtin, GlobalFunctionMap};
 
-use super::Builtin;
 use crate::args::CallArgs;
 use crate::common::QuoteKind;
 use crate::error::SassResult;
diff --git a/src/builtin/color/other.rs b/src/builtin/color/other.rs
index 7efdaf3..214b87e 100644
--- a/src/builtin/color/other.rs
+++ b/src/builtin/color/other.rs
@@ -1,8 +1,7 @@
-use super::GlobalFunctionMap;
+use super::{Builtin, GlobalFunctionMap};
 
 use num_traits::{One, Signed, Zero};
 
-use super::Builtin;
 use crate::args::CallArgs;
 use crate::color::Color;
 use crate::common::QuoteKind;
diff --git a/src/builtin/color/rgb.rs b/src/builtin/color/rgb.rs
index d31a96e..dbb9a3a 100644
--- a/src/builtin/color/rgb.rs
+++ b/src/builtin/color/rgb.rs
@@ -1,8 +1,7 @@
-use super::GlobalFunctionMap;
+use super::{Builtin, GlobalFunctionMap};
 
 use num_traits::One;
 
-use super::Builtin;
 use crate::args::CallArgs;
 use crate::color::Color;
 use crate::common::QuoteKind;
diff --git a/src/builtin/list.rs b/src/builtin/list.rs
index 4873f6a..47a93b2 100644
--- a/src/builtin/list.rs
+++ b/src/builtin/list.rs
@@ -1,8 +1,7 @@
-use super::GlobalFunctionMap;
+use super::{Builtin, GlobalFunctionMap};
 
 use num_traits::{One, Signed, ToPrimitive, Zero};
 
-use super::Builtin;
 use crate::args::CallArgs;
 use crate::common::{Brackets, ListSeparator, QuoteKind};
 use crate::error::SassResult;
diff --git a/src/builtin/map.rs b/src/builtin/map.rs
index 6a36241..7ddd514 100644
--- a/src/builtin/map.rs
+++ b/src/builtin/map.rs
@@ -1,6 +1,5 @@
-use super::GlobalFunctionMap;
+use super::{Builtin, GlobalFunctionMap};
 
-use super::Builtin;
 use crate::args::CallArgs;
 use crate::common::{Brackets, ListSeparator};
 use crate::error::SassResult;
diff --git a/src/builtin/math.rs b/src/builtin/math.rs
index cfcae11..0992409 100644
--- a/src/builtin/math.rs
+++ b/src/builtin/math.rs
@@ -1,11 +1,10 @@
-use super::GlobalFunctionMap;
+use super::{Builtin, GlobalFunctionMap};
 
 #[cfg(feature = "random")]
 use num_traits::{One, Signed, ToPrimitive, Zero};
 #[cfg(feature = "random")]
 use rand::Rng;
 
-use super::Builtin;
 use crate::args::CallArgs;
 use crate::error::SassResult;
 use crate::scope::Scope;
diff --git a/src/builtin/meta.rs b/src/builtin/meta.rs
index b59503d..02b0b43 100644
--- a/src/builtin/meta.rs
+++ b/src/builtin/meta.rs
@@ -1,8 +1,7 @@
-use super::GlobalFunctionMap;
+use super::{Builtin, GlobalFunctionMap, GLOBAL_FUNCTIONS};
 
 use codemap::Spanned;
 
-use super::{Builtin, GLOBAL_FUNCTIONS};
 use crate::args::CallArgs;
 use crate::common::QuoteKind;
 use crate::error::SassResult;
diff --git a/src/builtin/string.rs b/src/builtin/string.rs
index 4087b40..c6908fa 100644
--- a/src/builtin/string.rs
+++ b/src/builtin/string.rs
@@ -1,4 +1,4 @@
-use super::GlobalFunctionMap;
+use super::{Builtin, GlobalFunctionMap};
 
 use num_bigint::BigInt;
 use num_traits::{Signed, ToPrimitive, Zero};
@@ -6,7 +6,6 @@ use num_traits::{Signed, ToPrimitive, Zero};
 #[cfg(feature = "random")]
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
 
-use super::Builtin;
 use crate::args::CallArgs;
 use crate::common::QuoteKind;
 use crate::error::SassResult;