diff --git a/src/parse/value/parse.rs b/src/parse/value/parse.rs index f760b51..67f808f 100644 --- a/src/parse/value/parse.rs +++ b/src/parse/value/parse.rs @@ -534,8 +534,7 @@ impl<'a> Parser<'a> { self.toks.reset_cursor(); next_is_curly } - Some(..) => false, - None => false, + Some(..) | None => false, } } diff --git a/tests/addition.rs b/tests/addition.rs index bacac87..a766748 100644 --- a/tests/addition.rs +++ b/tests/addition.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/and.rs b/tests/and.rs index c438588..0d9f03d 100644 --- a/tests/and.rs +++ b/tests/and.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/arglist.rs b/tests/arglist.rs index 3d2ee21..cf0912c 100644 --- a/tests/arglist.rs +++ b/tests/arglist.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/args.rs b/tests/args.rs index 6d5f356..8cb7e81 100644 --- a/tests/args.rs +++ b/tests/args.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/at-error.rs b/tests/at-error.rs index 85e40ea..ab537fb 100644 --- a/tests/at-error.rs +++ b/tests/at-error.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/at-root.rs b/tests/at-root.rs index c919255..2d24d2f 100644 --- a/tests/at-root.rs +++ b/tests/at-root.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/charset.rs b/tests/charset.rs index 90efc30..a08e4a1 100644 --- a/tests/charset.rs +++ b/tests/charset.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/color.rs b/tests/color.rs index 5a7e98a..66f5057 100644 --- a/tests/color.rs +++ b/tests/color.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/comments.rs b/tests/comments.rs index 409239f..365335c 100644 --- a/tests/comments.rs +++ b/tests/comments.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/content-exists.rs b/tests/content-exists.rs index 2a83336..73d0199 100644 --- a/tests/content-exists.rs +++ b/tests/content-exists.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/division.rs b/tests/division.rs index ad7bcfb..44c28a9 100644 --- a/tests/division.rs +++ b/tests/division.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/each.rs b/tests/each.rs index e6cad28..77eafa8 100644 --- a/tests/each.rs +++ b/tests/each.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/equality.rs b/tests/equality.rs index fe0a33e..07abba1 100644 --- a/tests/equality.rs +++ b/tests/equality.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/error.rs b/tests/error.rs index ce0f151..39bc9d3 100644 --- a/tests/error.rs +++ b/tests/error.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/extend.rs b/tests/extend.rs index 2e162d0..3a11568 100644 --- a/tests/extend.rs +++ b/tests/extend.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/for.rs b/tests/for.rs index 14ae5c5..b10fedd 100644 --- a/tests/for.rs +++ b/tests/for.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/functions.rs b/tests/functions.rs index 333d4a1..b1f41e1 100644 --- a/tests/functions.rs +++ b/tests/functions.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/get-function.rs b/tests/get-function.rs index 2ec4e9f..2b9aefe 100644 --- a/tests/get-function.rs +++ b/tests/get-function.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/if.rs b/tests/if.rs index 417514d..e805d6e 100644 --- a/tests/if.rs +++ b/tests/if.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/important.rs b/tests/important.rs index 14bb543..a361295 100644 --- a/tests/important.rs +++ b/tests/important.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/imports.rs b/tests/imports.rs index 1d3528a..3a8470c 100644 --- a/tests/imports.rs +++ b/tests/imports.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - use std::io::Write; #[macro_use] diff --git a/tests/inspect.rs b/tests/inspect.rs index 136d11b..3388ce0 100644 --- a/tests/inspect.rs +++ b/tests/inspect.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/interpolation.rs b/tests/interpolation.rs index 3b11a0b..e72f35f 100644 --- a/tests/interpolation.rs +++ b/tests/interpolation.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/is-superselector.rs b/tests/is-superselector.rs index 9d03d37..6da02d5 100644 --- a/tests/is-superselector.rs +++ b/tests/is-superselector.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/keyframes.rs b/tests/keyframes.rs index 40f000d..a2cf6b9 100644 --- a/tests/keyframes.rs +++ b/tests/keyframes.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/list.rs b/tests/list.rs index 5b0b1dd..9f5a678 100644 --- a/tests/list.rs +++ b/tests/list.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/macros.rs b/tests/macros.rs index 9e4d3c2..d8069a2 100644 --- a/tests/macros.rs +++ b/tests/macros.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_export] macro_rules! test { ($( #[$attr:meta] ),*$func:ident, $input:expr) => { diff --git a/tests/map.rs b/tests/map.rs index 902b03b..c0c3cd0 100644 --- a/tests/map.rs +++ b/tests/map.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; test!( diff --git a/tests/math-module.rs b/tests/math-module.rs index 4f83a4d..4076df6 100644 --- a/tests/math-module.rs +++ b/tests/math-module.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/math.rs b/tests/math.rs index 07e67f6..10f1ea7 100644 --- a/tests/math.rs +++ b/tests/math.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/media.rs b/tests/media.rs index 0c04adf..0b5c061 100644 --- a/tests/media.rs +++ b/tests/media.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/meta-module.rs b/tests/meta-module.rs index e6ee9ba..5981e7e 100644 --- a/tests/meta-module.rs +++ b/tests/meta-module.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - use std::io::Write; #[macro_use] diff --git a/tests/meta.rs b/tests/meta.rs index 56f4d4b..c3c31ed 100644 --- a/tests/meta.rs +++ b/tests/meta.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/min-max.rs b/tests/min-max.rs index e7e902c..b9ec498 100644 --- a/tests/min-max.rs +++ b/tests/min-max.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/misc.rs b/tests/misc.rs index 22d8f1d..c9c68c5 100644 --- a/tests/misc.rs +++ b/tests/misc.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/mixins.rs b/tests/mixins.rs index 3864e53..4a996be 100644 --- a/tests/mixins.rs +++ b/tests/mixins.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/modulo.rs b/tests/modulo.rs index c708348..7961a55 100644 --- a/tests/modulo.rs +++ b/tests/modulo.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/multiplication.rs b/tests/multiplication.rs index 900cd03..b313047 100644 --- a/tests/multiplication.rs +++ b/tests/multiplication.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/not.rs b/tests/not.rs index 858c31b..c1c3399 100644 --- a/tests/not.rs +++ b/tests/not.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/null.rs b/tests/null.rs index 3d3fa3d..2b3cd27 100644 --- a/tests/null.rs +++ b/tests/null.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/number.rs b/tests/number.rs index 032976c..1315323 100644 --- a/tests/number.rs +++ b/tests/number.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/or.rs b/tests/or.rs index aa135c4..671108b 100644 --- a/tests/or.rs +++ b/tests/or.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/order-of-operations.rs b/tests/order-of-operations.rs index 2a82d03..d6c1211 100644 --- a/tests/order-of-operations.rs +++ b/tests/order-of-operations.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/ordering.rs b/tests/ordering.rs index 5a2b644..98a6085 100644 --- a/tests/ordering.rs +++ b/tests/ordering.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/plain-css-fn.rs b/tests/plain-css-fn.rs index 9a8d27a..bdbacec 100644 --- a/tests/plain-css-fn.rs +++ b/tests/plain-css-fn.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/rsass_issues.rs b/tests/rsass_issues.rs index 1e4318e..8d8ce3c 100644 --- a/tests/rsass_issues.rs +++ b/tests/rsass_issues.rs @@ -1,8 +1,6 @@ //! Test cases adapted verbatim from the rsass issue tracker //! https://github.com/kaj/rsass/issues?q=is%3Aissue -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/scope.rs b/tests/scope.rs index b7767a7..dc8df66 100644 --- a/tests/scope.rs +++ b/tests/scope.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/selector-append.rs b/tests/selector-append.rs index 28feda7..9a0de93 100644 --- a/tests/selector-append.rs +++ b/tests/selector-append.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/selector-extend.rs b/tests/selector-extend.rs index 039aa13..b384cec 100644 --- a/tests/selector-extend.rs +++ b/tests/selector-extend.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/selector-nest.rs b/tests/selector-nest.rs index d7dde1c..fc72acb 100644 --- a/tests/selector-nest.rs +++ b/tests/selector-nest.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/selector-parse.rs b/tests/selector-parse.rs index 3984526..c9a5dba 100644 --- a/tests/selector-parse.rs +++ b/tests/selector-parse.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/selector-replace.rs b/tests/selector-replace.rs index 853f2bd..6202e30 100644 --- a/tests/selector-replace.rs +++ b/tests/selector-replace.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/selector-unify.rs b/tests/selector-unify.rs index 6ddd176..64eef91 100644 --- a/tests/selector-unify.rs +++ b/tests/selector-unify.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/selectors.rs b/tests/selectors.rs index e4a4dc5..5579cf0 100644 --- a/tests/selectors.rs +++ b/tests/selectors.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/simple-selectors.rs b/tests/simple-selectors.rs index 0c987d9..2d9d709 100644 --- a/tests/simple-selectors.rs +++ b/tests/simple-selectors.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/special-functions.rs b/tests/special-functions.rs index 8ec9a55..8af6f23 100644 --- a/tests/special-functions.rs +++ b/tests/special-functions.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/splat.rs b/tests/splat.rs index c5b3166..07a2cdb 100644 --- a/tests/splat.rs +++ b/tests/splat.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/str-escape.rs b/tests/str-escape.rs index b45d470..681f701 100644 --- a/tests/str-escape.rs +++ b/tests/str-escape.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/strings.rs b/tests/strings.rs index 4cf3ff2..71afddb 100644 --- a/tests/strings.rs +++ b/tests/strings.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/styles.rs b/tests/styles.rs index 24b6ebd..65338de 100644 --- a/tests/styles.rs +++ b/tests/styles.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/subtraction.rs b/tests/subtraction.rs index 9d1a590..3e7ce15 100644 --- a/tests/subtraction.rs +++ b/tests/subtraction.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/supports.rs b/tests/supports.rs index 63a888a..59a6ba5 100644 --- a/tests/supports.rs +++ b/tests/supports.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/unary.rs b/tests/unary.rs index 541a8b8..030f4ae 100644 --- a/tests/unary.rs +++ b/tests/unary.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/unicode-range.rs b/tests/unicode-range.rs index ffb1190..80e7a5e 100644 --- a/tests/unicode-range.rs +++ b/tests/unicode-range.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/units.rs b/tests/units.rs index bb28e38..886c5f9 100644 --- a/tests/units.rs +++ b/tests/units.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/unknown-at-rule.rs b/tests/unknown-at-rule.rs index 032684b..37e09c9 100644 --- a/tests/unknown-at-rule.rs +++ b/tests/unknown-at-rule.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/url.rs b/tests/url.rs index 5228f07..30b53e9 100644 --- a/tests/url.rs +++ b/tests/url.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/use.rs b/tests/use.rs index 0dca5c4..928ebec 100644 --- a/tests/use.rs +++ b/tests/use.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - use std::io::Write; #[macro_use] diff --git a/tests/values.rs b/tests/values.rs index 3973314..528b197 100644 --- a/tests/values.rs +++ b/tests/values.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/variables.rs b/tests/variables.rs index 555f275..046ae68 100644 --- a/tests/variables.rs +++ b/tests/variables.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros; diff --git a/tests/while.rs b/tests/while.rs index eec83b7..dc33ac3 100644 --- a/tests/while.rs +++ b/tests/while.rs @@ -1,5 +1,3 @@ -#![cfg(test)] - #[macro_use] mod macros;