From 72f2303b50a6c48741d5031eb01ccb1e868fff9e Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 24 Apr 2017 19:22:14 +0900 Subject: [PATCH] Remove broken support for bindings inside match_ignore_ascii_case. Fix #126. --- Cargo.toml | 4 ++-- macros/Cargo.toml | 2 +- macros/lib.rs | 10 +--------- src/macros.rs | 2 +- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7abcb612..e1c1de94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cssparser" -version = "0.12.4" +version = "0.13.0" authors = [ "Simon Sapin " ] description = "Rust implementation of CSS Syntax Level 3" @@ -20,7 +20,7 @@ difference = "1.0" encoding_rs = "0.5" [dependencies] -cssparser-macros = {path = "./macros", version = "0.2"} +cssparser-macros = {path = "./macros", version = "0.3"} heapsize = {version = "0.3", optional = true} matches = "0.1" phf = "0.7" diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 3dd61a72..4770b4b1 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cssparser-macros" -version = "0.2.0" +version = "0.3.0" authors = ["Simon Sapin "] description = "Procedural macros for cssparser" documentation = "https://docs.rs/cssparser-macros/" diff --git a/macros/lib.rs b/macros/lib.rs index 5f354bb1..80d3e545 100644 --- a/macros/lib.rs +++ b/macros/lib.rs @@ -27,15 +27,7 @@ define_proc_macros! { max_len(arms.iter().flat_map(|arm| &arm.pats).filter_map(|pattern| { let expr = match *pattern { syn::Pat::Lit(ref expr) => expr, - syn::Pat::Wild | - syn::Pat::Ident(_, _, None) => return None, - syn::Pat::Ident(_, _, Some(ref sub_pattern)) => { - match **sub_pattern { - syn::Pat::Lit(ref expr) => expr, - syn::Pat::Wild => return None, - _ => panic!("expected string or wildcard pattern, got {:?}", pattern) - } - } + syn::Pat::Wild => return None, _ => panic!("expected string or wildcard pattern, got {:?}", pattern) }; match **expr { diff --git a/src/macros.rs b/src/macros.rs index 53a29406..f3b80f09 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -22,7 +22,7 @@ define_invoke_proc_macro!(cssparser_internal__invoke_proc_macro); /// "rgba" => parse_rgba(..), /// "hsl" => parse_hsl(..), /// "hsla" => parse_hsla(..), -/// name @ _ => Err(format!("unknown function: {}", name)) +/// _ => Err(format!("unknown function: {}", function_name)) /// } /// # ;} /// # use std::ops::RangeFull;