Bug 1527553 - Update the mozilla-central workspace hack. r=firefox-build-system-reviewers,mshal
authorChris Manchester <cmanchester@mozilla.com>
Tue, 26 Feb 2019 19:37:49 +0000
changeset 461248 cabd5a85dc0fe6a4a40fb93025801b34a01e0262
parent 461247 8a75915b2541f5ad01212ec087ea067bf50a1ce0
child 461249 7754ccd4cb02ef10f9e5c90b6da3a122ae5e53e3
push id35621
push userncsoregi@mozilla.com
push dateWed, 27 Feb 2019 04:29:56 +0000
treeherdermozilla-central@31abc7fd9a26 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfirefox-build-system-reviewers, mshal
bugs1527553
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1527553 - Update the mozilla-central workspace hack. r=firefox-build-system-reviewers,mshal Differential Revision: https://phabricator.services.mozilla.com/D20738
Cargo.lock
build/workspace-hack/Cargo.toml
js/src/rust/Cargo.toml
js/src/rust/shared/Cargo.toml
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1313,24 +1313,24 @@ dependencies = [
  "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "jsrust"
 version = "0.1.0"
 dependencies = [
  "jsrust_shared 0.1.0",
- "mozilla-central-workspace-hack 0.1.0",
 ]
 
 [[package]]
 name = "jsrust_shared"
 version = "0.1.0"
 dependencies = [
  "baldrdash 0.1.0",
+ "mozilla-central-workspace-hack 0.1.0",
 ]
 
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1666,17 +1666,17 @@ dependencies = [
 name = "mozilla-central-workspace-hack"
 version = "0.1.0"
 dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.80 (git+https://github.com/servo/serde?branch=deserialize_from_enums9)",
- "syn 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (git+https://github.com/froydnj/winapi-rs?branch=aarch64)",
 ]
 
 [[package]]
 name = "mozjs_sys"
 version = "0.0.0"
 dependencies = [
--- a/build/workspace-hack/Cargo.toml
+++ b/build/workspace-hack/Cargo.toml
@@ -10,18 +10,18 @@ version = "0.1.0"
 #  "Each time Cargo runs a build it will re-resolve the dependency graph, "
 #  "notably selecting different features sometimes for each build."
 #
 # We work around this by specifying the union of the set of features selected
 # by dependencies in each cargo invocation for each instance they would differ.
 
 [build-dependencies]
 void = { features = ["std", "default"], version = "1.0.2" }
-syn = { features = ["extra-traits", "fold", "full"],  version = "0.14" }
-log = { features = ["release_max_level_info", "release_max_level_warn", "std"],  version = "0.4.5" }
+syn = { features = ["clone-impls", "default", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit"],  version = "0.15" }
+log = { features = ["release_max_level_info", "release_max_level_warn", "std"],  version = "0.4.6" }
 serde = { features = ["default", "rc", "serde_derive", "std"], version = "1.0.66" }
 serde_derive = { features = ["default", "deserialize_in_place"], version = "1.0.66" }
 quote = { features = ["default", "proc-macro"], version = "0.5.2" }
 proc-macro2 = { features = ["default", "proc-macro"], version = "0.3.5" }
 
 [target."cfg(windows)".dependencies.winapi]
 version = "0.3.6"
 features = [
--- a/js/src/rust/Cargo.toml
+++ b/js/src/rust/Cargo.toml
@@ -5,9 +5,8 @@ authors = ["The Spidermonkey developers"
 
 [lib]
 name = "jsrust"
 crate-type = ["staticlib"]
 path = "lib.rs"
 
 [dependencies]
 jsrust_shared = { path = "./shared" }
-mozilla-central-workspace-hack = { path = "../../../build/workspace-hack" }
--- a/js/src/rust/shared/Cargo.toml
+++ b/js/src/rust/shared/Cargo.toml
@@ -5,12 +5,13 @@ authors = ["The Spidermonkey developers"
 
 [lib]
 crate-type = ["rlib"]
 name = "jsrust_shared"
 path = "lib.rs"
 
 [dependencies]
 baldrdash = { path = "../../wasm/cranelift" }
+mozilla-central-workspace-hack = { path = "../../../../build/workspace-hack" }
 
 # Uncomment this to enable perf support in release mode.
 #[profile.release]
 #debug = true