Created
April 30, 2017 03:36
-
-
Save bholley/85dc2277aaa732bce04cc9e672915595 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# HG changeset patch | |
# User Bobby Holley <bobbyholley@gmail.com> | |
# Date 1486424956 28800 | |
# Node ID 18dc070e0308827e76f66f8c684094d9373b71a6 | |
# Parent 3ab3d12fc9a1423aaf2f2c48ab56ef0e54806e6e | |
Override to use local rust-selectors. | |
diff --git a/servo/Cargo.lock b/servo/Cargo.lock | |
--- a/servo/Cargo.lock | |
+++ b/servo/Cargo.lock | |
@@ -2395,25 +2395,30 @@ dependencies = [ | |
"time 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", | |
"url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | |
"webvr_traits 0.0.1", | |
] | |
[[package]] | |
name = "selectors" | |
version = "0.15.2" | |
-source = "registry+https://github.com/rust-lang/crates.io-index" | |
dependencies = [ | |
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", | |
"cssparser 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", | |
"fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", | |
"matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", | |
] | |
[[package]] | |
+name = "selectors" | |
+version = "0.15.2" | |
+source = "registry+https://github.com/rust-lang/crates.io-index" | |
+replace = "selectors 0.15.2" | |
+ | |
+[[package]] | |
name = "semver" | |
version = "0.1.20" | |
source = "registry+https://github.com/rust-lang/crates.io-index" | |
[[package]] | |
name = "semver" | |
version = "0.2.3" | |
source = "registry+https://github.com/rust-lang/crates.io-index" | |
diff --git a/servo/Cargo.toml b/servo/Cargo.toml | |
--- a/servo/Cargo.toml | |
+++ b/servo/Cargo.toml | |
@@ -9,8 +9,11 @@ members = [ | |
[profile.dev] | |
codegen-units = 4 | |
[profile.release] | |
opt-level = 3 | |
# Uncomment to profile on Linux: | |
# debug = true | |
# lto = false | |
+ | |
+[replace] | |
+"selectors:0.15.2" = { path = "../third_party/rust/selectors" } | |
diff --git a/toolkit/library/gtest/rust/Cargo.lock b/toolkit/library/gtest/rust/Cargo.lock | |
--- a/toolkit/library/gtest/rust/Cargo.lock | |
+++ b/toolkit/library/gtest/rust/Cargo.lock | |
@@ -550,25 +550,30 @@ dependencies = [ | |
[[package]] | |
name = "rustc-serialize" | |
version = "0.3.22" | |
source = "registry+https://github.com/rust-lang/crates.io-index" | |
[[package]] | |
name = "selectors" | |
version = "0.15.2" | |
-source = "registry+https://github.com/rust-lang/crates.io-index" | |
dependencies = [ | |
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", | |
"cssparser 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", | |
"fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", | |
"matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", | |
] | |
[[package]] | |
+name = "selectors" | |
+version = "0.15.2" | |
+source = "registry+https://github.com/rust-lang/crates.io-index" | |
+replace = "selectors 0.15.2" | |
+ | |
+[[package]] | |
name = "serde" | |
version = "0.8.23" | |
source = "registry+https://github.com/rust-lang/crates.io-index" | |
[[package]] | |
name = "serde_json" | |
version = "0.8.6" | |
source = "registry+https://github.com/rust-lang/crates.io-index" | |
diff --git a/toolkit/library/gtest/rust/Cargo.toml b/toolkit/library/gtest/rust/Cargo.toml | |
--- a/toolkit/library/gtest/rust/Cargo.toml | |
+++ b/toolkit/library/gtest/rust/Cargo.toml | |
@@ -40,8 +40,11 @@ rpath = false | |
# This would normally be 'true' for release configurations, but using LTO on | |
# rul-gtest causes link failures due to symbols also being found in libxul's | |
# librul.a. But LTO'ing things here is not crucial and not LTO'ing things | |
# enables us to link libxul-gtest, so we leave it turned off. | |
lto = false | |
debug-assertions = false | |
codegen-units = 1 | |
panic = "abort" | |
+ | |
+[replace] | |
+"selectors:0.15.2" = { path = "../../../../third_party/rust/selectors" } | |
diff --git a/toolkit/library/rust/Cargo.lock b/toolkit/library/rust/Cargo.lock | |
--- a/toolkit/library/rust/Cargo.lock | |
+++ b/toolkit/library/rust/Cargo.lock | |
@@ -537,25 +537,30 @@ dependencies = [ | |
[[package]] | |
name = "rustc-serialize" | |
version = "0.3.22" | |
source = "registry+https://github.com/rust-lang/crates.io-index" | |
[[package]] | |
name = "selectors" | |
version = "0.15.2" | |
-source = "registry+https://github.com/rust-lang/crates.io-index" | |
dependencies = [ | |
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", | |
"cssparser 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", | |
"fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", | |
"matches 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", | |
] | |
[[package]] | |
+name = "selectors" | |
+version = "0.15.2" | |
+source = "registry+https://github.com/rust-lang/crates.io-index" | |
+replace = "selectors 0.15.2" | |
+ | |
+[[package]] | |
name = "serde" | |
version = "0.8.23" | |
source = "registry+https://github.com/rust-lang/crates.io-index" | |
[[package]] | |
name = "serde_json" | |
version = "0.8.6" | |
source = "registry+https://github.com/rust-lang/crates.io-index" | |
diff --git a/toolkit/library/rust/Cargo.toml b/toolkit/library/rust/Cargo.toml | |
--- a/toolkit/library/rust/Cargo.toml | |
+++ b/toolkit/library/rust/Cargo.toml | |
@@ -33,8 +33,11 @@ panic = "abort" | |
[profile.release] | |
opt-level = 2 | |
debug = true | |
rpath = false | |
lto = true | |
debug-assertions = false | |
panic = "abort" | |
+ | |
+[replace] | |
+"selectors:0.15.2" = { path = "../../../third_party/rust/selectors" } | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment