Update regex.

servo · Jan 16, 2017 · a1d478f · a1d478f
1 parent ad1b117
commit a1d478f
Show file tree

Hide file tree

Showing 13 changed files with 71 additions and 70 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/bluetooth_traits/Cargo.toml b/components/bluetooth_traits/Cargo.toml
@@ -11,7 +11,7 @@ path = "lib.rs"
 
 [dependencies]
 ipc-channel = "0.5"
-regex = "0.1.43"
+regex = "0.2"
 serde = "0.8"
 serde_derive = "0.8"
 servo_config = {path = "../config"}
diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml
@@ -29,7 +29,7 @@ plugins = {path = "../plugins", optional = true}
 url = "1.2"
 
 [dev-dependencies]
-env_logger = "0.3"
+env_logger = "0.4"
 
 [target.'cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))'.dependencies]
 xdg = "2.0"
diff --git a/components/plugins/Cargo.toml b/components/plugins/Cargo.toml
@@ -11,7 +11,7 @@ path = "lib.rs"
 plugin = true
 
 [dependencies.clippy_lints]
-version = "0.0.98"
+version = "0.0.107"
 optional = true
 
 [features]

diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml
@@ -25,7 +25,7 @@ time = "0.1.12"
 task_info = {path = "../../support/rust-task_info"}
 
 [target.'cfg(target_os = "linux")'.dependencies]
-regex = "0.1.55"
+regex = "0.2"
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
 libc = "0.2"
diff --git a/components/profile/mem.rs b/components/profile/mem.rs
@@ -610,8 +610,8 @@ mod system_reporter {
                     Some(cap) => cap,
                     None => continue,
                 };
-                let perms = cap.at(1).unwrap();
-                let pathname = cap.at(2).unwrap();
+                let perms = cap.get(1).unwrap().as_str();
+                let pathname = cap.get(2).unwrap().as_str();
 
                 // Construct the segment name from its pathname and permissions.
                 curr_seg_name.clear();
@@ -635,7 +635,7 @@ mod system_reporter {
                     Some(cap) => cap,
                     None => continue,
                 };
-                let rss = cap.at(1).unwrap().parse::<usize>().unwrap() * 1024;
+                let rss = cap.get(1).unwrap().as_str().parse::<usize>().unwrap() * 1024;
 
                 if rss > 0 {
                     // Aggregate small segments into "other".

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -63,7 +63,7 @@ profile_traits = {path = "../profile_traits"}
 range = {path = "../range"}
 ref_filter_map = "1.0.1"
 ref_slice = "1.0"
-regex = "0.1.43"
+regex = "0.2"
 rustc-serialize = "0.3"
 script_layout_interface = {path = "../script_layout_interface"}
 script_traits = {path = "../script_traits"}

diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
@@ -32,7 +32,7 @@ constellation = {path = "../constellation"}
 debugger = {path = "../debugger"}
 devtools = {path = "../devtools"}
 devtools_traits = {path = "../devtools_traits"}
-env_logger = "0.3"
+env_logger = "0.4"
 euclid = "0.10.1"
 gfx = {path = "../gfx"}
 gleam = "0.2"

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
@@ -68,5 +68,5 @@ kernel32-sys = "0.2"
 lazy_static = "0.2"
 libbindgen = {version = "0.1.5", optional = true}
 phf_codegen = "0.7.20"
-regex = {version = "0.1", optional = true}
+regex = {version = "0.2", optional = true}
 walkdir = "0.1"
diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
@@ -19,11 +19,11 @@ log = "0.3.5"
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 plugins = {path = "../plugins"}
-regex = "0.1.55"
+regex = "0.2"
 rustc-serialize = "0.3.4"
 script_traits = {path = "../script_traits"}
 servo_config = {path = "../config", features = ["servo"]}
 servo_url = {path = "../url", features = ["servo"]}
 url = {version = "1.2", features = ["heap_size"]}
 uuid = { version = "0.3.1", features = ["v4"] }
-webdriver = "0.17"
+webdriver = "0.19"
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
@@ -877,7 +877,7 @@ impl WebDriverHandler<ServoExtensionRoute> for Handler {
             WebDriverCommand::SwitchToParentFrame => self.handle_switch_to_parent_frame(),
             WebDriverCommand::FindElement(ref parameters) => self.handle_find_element(parameters),
             WebDriverCommand::FindElements(ref parameters) => self.handle_find_elements(parameters),
-            WebDriverCommand::GetCookie(ref name) => self.handle_get_cookie(name),
+            WebDriverCommand::GetNamedCookie(ref name) => self.handle_get_cookie(name),
             WebDriverCommand::GetCookies => self.handle_get_cookies(),
             WebDriverCommand::GetActiveElement => self.handle_active_element(),
             WebDriverCommand::GetElementRect(ref element) => self.handle_element_rect(element),

diff --git a/ports/geckolib/Cargo.toml b/ports/geckolib/Cargo.toml
@@ -16,7 +16,7 @@ bindgen = ["style/bindgen"]
 app_units = "0.3"
 atomic_refcell = "0.1"
 cssparser = {version = "0.7"}
-env_logger = {version = "0.3", default-features = false} # disable `regex` to reduce code size
+env_logger = {version = "0.4", default-features = false} # disable `regex` to reduce code size
 euclid = "0.10.1"
 lazy_static = "0.2"
 libc = "0.2"

diff --git a/tests/unit/stylo/Cargo.toml b/tests/unit/stylo/Cargo.toml
@@ -15,7 +15,7 @@ doctest = false
 app_units = "0.3"
 atomic_refcell = "0.1"
 cssparser = {version = "0.7"}
-env_logger = "0.3"
+env_logger = "0.4"
 euclid = "0.10.1"
 lazy_static = "0.2"
 libc = "0.2"