servo: Merge #9380 - Update cssparser (from servo:cssparserup); r=Sim…

…onSapin servo/rust-cssparser#91 Source-Repo: https://github.com/servo/servo Source-Revision: 1ba1fb0b7f46472e1f37f4e3f2e7dde025fa9f1f UltraBlame original commit: 9dc742835b57cb0d99cf8d0966bedcaa3e9c28c4
marco-c · Oct 1, 2019 · ebfce9f · ebfce9f
1 parent 9ffe27d
commit ebfce9f
Show file tree

Hide file tree

Showing 21 changed files with 104 additions and 125 deletions.
diff --git a/servo/components/canvas_traits/Cargo.toml b/servo/components/canvas_traits/Cargo.toml
@@ -35,7 +35,7 @@ path = "../plugins"
 path = "../util"
 
 [dependencies]
-cssparser = { version = "0.4", features = [ "serde-serialization" ] }
+cssparser = { version = "0.5", features = [ "serde-serialization" ] }
 euclid = {version = "0.4", features = ["plugins"]}
 serde_macros = "0.6"
 
diff --git a/servo/components/layout/Cargo.toml b/servo/components/layout/Cargo.toml
@@ -55,7 +55,7 @@ git = "https://github.com/servo/ipc-channel"
 
 [dependencies]
 app_units = {version = "0.1", features = ["plugins"]}
-cssparser = { version = "0.4", features = [ "serde-serialization" ] }
+cssparser = { version = "0.5", features = [ "serde-serialization" ] }
 log = "0.3"
 fnv = "1.0"
 bitflags = "0.3"

diff --git a/servo/components/msg/Cargo.toml b/servo/components/msg/Cargo.toml
@@ -21,7 +21,7 @@ git = "https://github.com/servo/ipc-channel"
 path = "../plugins"
 
 [dependencies]
-cssparser = { version = "0.4", features = [ "serde-serialization" ] }
+cssparser = { version = "0.5", features = [ "serde-serialization" ] }
 bitflags = "0.3"
 hyper = { version = "0.7", features = [ "serde-serialization" ] }
 rustc-serialize = "0.3.4"

diff --git a/servo/components/script/Cargo.toml b/servo/components/script/Cargo.toml
@@ -64,7 +64,7 @@ path = "../gfx_traits"
 
 [dependencies]
 app_units = {version = "0.1", features = ["plugins"]}
-cssparser = { version = "0.4", features = [ "serde-serialization" ] }
+cssparser = { version = "0.5", features = [ "serde-serialization" ] }
 log = "0.3"
 encoding = "0.2"
 fnv = "1.0"

diff --git a/servo/components/servo/Cargo.lock b/servo/components/servo/Cargo.lock
diff --git a/servo/components/style/Cargo.toml b/servo/components/style/Cargo.toml
@@ -20,7 +20,7 @@ path = "../style_traits"
 
 [dependencies]
 app_units = {version = "0.1", features = ["plugins"]}
-cssparser = { version = "0.4", features = [ "serde-serialization" ] }
+cssparser = { version = "0.5", features = [ "serde-serialization" ] }
 log = "0.3"
 encoding = "0.2"
 fnv = "1.0"

diff --git a/servo/components/style/font_face.rs b/servo/components/style/font_face.rs
@@ -91,7 +91,7 @@ impl<'a, 'b> DeclarationParser for FontFaceRuleParser<'a, 'b> {
                 Ok(FontFaceDescriptorDeclaration::Src(try!(input.parse_comma_separated(|input| {
                     parse_one_src(self.context, input)
                 }))))
-            }
+            },
             _ => Err(())
         }
     }

diff --git a/servo/components/style/lib.rs b/servo/components/style/lib.rs
@@ -15,6 +15,8 @@
 #![plugin(serde_macros)]
 #![plugin(plugins)]
 
+#![recursion_limit = "500"]  
+
 extern crate app_units;
 #[macro_use]
 extern crate bitflags;

diff --git a/servo/components/style/media_queries.rs b/servo/components/style/media_queries.rs
@@ -133,7 +133,7 @@ impl Expression {
                 },
                 "max-width" => {
                     Ok(Expression::Width(Range::Max(try!(specified::Length::parse_non_negative(input)))))
-                }
+                },
                 _ => Err(())
             }
         })
@@ -157,7 +157,7 @@ impl MediaQuery {
             media_type = match_ignore_ascii_case! { ident,
                 "screen" => MediaQueryType::MediaType(MediaType::Screen),
                 "print" => MediaQueryType::MediaType(MediaType::Print),
-                "all" => MediaQueryType::All
+                "all" => MediaQueryType::All,
                 _ => MediaQueryType::MediaType(MediaType::Unknown)
             }
         } else {
-Original file line number
+Diff line change
@@ Expand Up @@
                     Ok(FontFaceDescriptorDeclaration::Src(try!(input.parse_comma_separated(|input| {
                         parse_one_src(self.context, input)
                     }))))
-                }
+                },
                 _ => Err(())
             }
         }
@@ Expand Down @@