From 70aa253a65317b5ed11ac7013c648faa71e19144 Mon Sep 17 00:00:00 2001 From: Gilles Leblanc Date: Thu, 5 Mar 2015 21:09:41 -0500 Subject: [PATCH] Specify regex and regex_macros version numbers For compatibility with current Rust version. Issue #5063 --- components/net/Cargo.toml | 4 ++-- ports/cef/Cargo.lock | 10 ++++++++++ ports/gonk/Cargo.lock | 10 ++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 27c66fa18b8..a80a07b7dba 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -29,5 +29,5 @@ time = "0.1.17" openssl="0.3.1" rustc-serialize = "0.2" cookie="*" -regex = "*" -regex_macros = "*" +regex = "0.1.14" +regex_macros = "0.1.8" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 423e2be2246..3936f5626be 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -621,6 +621,8 @@ dependencies = [ "hyper 0.1.10 (git+https://github.com/servo/hyper?branch=servo)", "openssl 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.1.0 (git+https://github.com/servo/rust-png)", + "regex 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "regex_macros 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -710,6 +712,14 @@ name = "regex" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "regex_macros" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "regex 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rustc-serialize" version = "0.2.12" diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index e7c1f955094..12dd2979ee7 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -532,6 +532,8 @@ dependencies = [ "hyper 0.1.10 (git+https://github.com/servo/hyper?branch=servo)", "openssl 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.1.0 (git+https://github.com/servo/rust-png)", + "regex 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "regex_macros 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "time 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -621,6 +623,14 @@ name = "regex" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "regex_macros" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "regex 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rustc-serialize" version = "0.2.12"