From 25e6151aa934e7b19badcbc294011cca30ac6355 Mon Sep 17 00:00:00 2001
From: ConnorSkees <39542938+ConnorSkees@users.noreply.github.com>
Date: Tue, 21 Apr 2020 18:28:46 -0400
Subject: [PATCH] remove workaround for compiler regression

---
 src/builtin/color/other.rs | 11 +++++------
 src/builtin/macros.rs      | 34 ----------------------------------
 2 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/src/builtin/color/other.rs b/src/builtin/color/other.rs
index d86b8da..30e30cd 100644
--- a/src/builtin/color/other.rs
+++ b/src/builtin/color/other.rs
@@ -10,9 +10,8 @@ use crate::value::{Number, Value};
 
 macro_rules! opt_rgba {
     ($args:ident, $name:ident, $arg:literal, $low:literal, $high:literal, $scope:ident, $super_selector:ident) => {
-        let x = $low;
         let $name = match named_arg!($args, $scope, $super_selector, $arg = Value::Null) {
-            Value::Dimension(n, u) => Some(bound!($args, $arg, n, u, x, $high)),
+            Value::Dimension(n, u) => Some(bound!($args, $arg, n, u, $low, $high)),
             Value::Null => None,
             v => {
                 return Err((
@@ -31,9 +30,10 @@ macro_rules! opt_rgba {
 
 macro_rules! opt_hsl {
     ($args:ident, $name:ident, $arg:literal, $low:literal, $high:literal, $scope:ident, $super_selector:ident) => {
-        let x = $low;
         let $name = match named_arg!($args, $scope, $super_selector, $arg = Value::Null) {
-            Value::Dimension(n, u) => Some(bound!($args, $arg, n, u, x, $high) / Number::from(100)),
+            Value::Dimension(n, u) => {
+                Some(bound!($args, $arg, n, u, $low, $high) / Number::from(100))
+            }
             Value::Null => None,
             v => {
                 return Err((
@@ -188,10 +188,9 @@ pub(crate) fn register(f: &mut HashMap<String, Builtin>) {
 
             macro_rules! opt_scale_arg {
                 ($args:ident, $name:ident, $arg:literal, $low:literal, $high:literal, $scope:ident, $super_selector:ident) => {
-                    let x = $low;
                     let $name = match named_arg!($args, $scope, $super_selector, $arg = Value::Null) {
                         Value::Dimension(n, Unit::Percent) => {
-                            Some(bound!($args, $arg, n, Unit::Percent, x, $high) / Number::from(100))
+                            Some(bound!($args, $arg, n, Unit::Percent, $low, $high) / Number::from(100))
                         }
                         v @ Value::Dimension(..) => {
                             return Err(
diff --git a/src/builtin/macros.rs b/src/builtin/macros.rs
index 5c16d33..4fad323 100644
--- a/src/builtin/macros.rs
+++ b/src/builtin/macros.rs
@@ -70,23 +70,6 @@ macro_rules! bound {
             $arg
         }
     };
-    // HACK: we accept `$low` as an ident here in order to work around
-    // a bug in the nightly compiler.
-    // https://github.com/rust-lang/rust/issues/70050
-    ($args:ident, $name:literal, $arg:ident, $unit:ident, $low:ident, $high:literal) => {
-        if $arg > Number::from($high) || $arg < Number::from($low) {
-            return Err((
-                format!(
-                    "${}: Expected {}{} to be within {}{} and {}{}.",
-                    $name, $arg, $unit, $low, $unit, $high, $unit,
-                ),
-                $args.span(),
-            )
-                .into());
-        } else {
-            $arg
-        }
-    };
     ($args:ident, $name:literal, $arg:ident, $unit:path, $low:literal, $high:literal) => {
         if $arg > Number::from($high) || $arg < Number::from($low) {
             return Err((
@@ -101,21 +84,4 @@ macro_rules! bound {
             $arg
         }
     };
-    // HACK: we accept `$low` as an ident here in order to work around
-    // a bug in the nightly compiler.
-    // https://github.com/rust-lang/rust/issues/70050
-    ($args:ident, $name:literal, $arg:ident, $unit:path, $low:ident, $high:literal) => {
-        if $arg > Number::from($high) || $arg < Number::from($low) {
-            return Err((
-                format!(
-                    "${}: Expected {}{} to be within {}{} and {}{}.",
-                    $name, $arg, $unit, $low, $unit, $high, $unit,
-                ),
-                $args.span(),
-            )
-                .into());
-        } else {
-            $arg
-        }
-    };
 }