Bug 1461737 - Move nsstring-rs to a better location, r=nika
authorbitnotri <bitnotri@protonmail.com>
Fri, 04 Jan 2019 22:03:56 +0000
changeset 452584 8e900ef58b0f05fa6cacd29b719bbb14ad8c8e72
parent 452583 f000153a1f7f599af8c805c5d447ef81fc5f14d3
child 452585 6dd228164d427b7b247e59e7d9d0251206dea83d
push id35315
push usershindli@mozilla.com
push dateSat, 05 Jan 2019 03:59:26 +0000
treeherdermozilla-central@6dd228164d42 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnika
bugs1461737
milestone66.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 1461737 - Move nsstring-rs to a better location, r=nika Differential Revision: https://phabricator.services.mozilla.com/D15743
gfx/webrender_bindings/Cargo.toml
intl/encoding_glue/Cargo.toml
netwerk/base/mozurl/Cargo.toml
netwerk/base/rust-helper/Cargo.toml
servo/components/style/Cargo.toml
servo/ports/geckolib/Cargo.toml
servo/support/gecko/nsstring/Cargo.toml
servo/support/gecko/nsstring/src/conversions.rs
servo/support/gecko/nsstring/src/lib.rs
toolkit/library/rust/shared/Cargo.toml
xpcom/rust/gtest/nsstring/Cargo.toml
xpcom/rust/gtest/xpcom/Cargo.toml
xpcom/rust/nserror/Cargo.toml
xpcom/rust/nsstring/Cargo.toml
xpcom/rust/nsstring/src/conversions.rs
xpcom/rust/nsstring/src/lib.rs
xpcom/rust/xpcom/Cargo.toml
--- a/gfx/webrender_bindings/Cargo.toml
+++ b/gfx/webrender_bindings/Cargo.toml
@@ -6,17 +6,17 @@ license = "MPL-2.0"
 
 [dependencies]
 rayon = "1"
 thread_profiler = "0.1.1"
 euclid = { version = "0.19.4", features = ["serde"] }
 app_units = "0.7"
 gleam = "0.6.8"
 log = "0.4"
-nsstring = { path = "../../servo/support/gecko/nsstring" }
+nsstring = { path = "../../xpcom/rust/nsstring" } 
 bincode = "1.0"
 uuid = { version = "0.6", features = ["v4"] }
 fxhash = "0.2.1"
 
 [dependencies.webrender]
 path = "../wr/webrender"
 version = "0.58.0"
 default-features = false
--- a/intl/encoding_glue/Cargo.toml
+++ b/intl/encoding_glue/Cargo.toml
@@ -5,10 +5,10 @@ version = "0.1.0"
 authors = ["Henri Sivonen <hsivonen@hsivonen.fi>"]
 license = "MIT/Apache-2.0"
 
 [features]
 simd-accel = ["encoding_rs/simd-accel"]
 
 [dependencies]
 encoding_rs = "0.8.0"
-nsstring = { path = "../../servo/support/gecko/nsstring" }
+nsstring = { path = "../../xpcom/rust/nsstring" } 
 nserror = { path = "../../xpcom/rust/nserror" }
--- a/netwerk/base/mozurl/Cargo.toml
+++ b/netwerk/base/mozurl/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "mozurl"
 version = "0.0.1"
 authors = ["Nika Layzell <nika@thelayzells.com>"]
 
 [dependencies]
 url = "1.7.2"
-nsstring = { path = "../../../servo/support/gecko/nsstring" }
 nserror = { path = "../../../xpcom/rust/nserror" }
+nsstring = { path = "../../../xpcom/rust/nsstring" }
 xpcom = { path = "../../../xpcom/rust/xpcom" }
--- a/netwerk/base/rust-helper/Cargo.toml
+++ b/netwerk/base/rust-helper/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "netwerk_helper"
 version = "0.0.1"
 authors = ["Jeff Hemphill <jthemphill@mozilla.com>"]
 
 [dependencies]
 nserror = { path = "../../../xpcom/rust/nserror" }
-nsstring = { path = "../../../servo/support/gecko/nsstring" }
+nsstring = { path = "../../../xpcom/rust/nsstring" }
--- a/servo/components/style/Cargo.toml
+++ b/servo/components/style/Cargo.toml
@@ -42,17 +42,17 @@ hashglobe = { path = "../hashglobe" }
 html5ever = {version = "0.22", optional = true}
 itertools = "0.7.6"
 itoa = "0.4"
 lazy_static = "1"
 log = "0.4"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = { path = "../malloc_size_of_derive" }
 matches = "0.1"
-nsstring = {path = "../../support/gecko/nsstring", optional = true}
+nsstring = {path = "../../../xpcom/rust/nsstring/", optional = true}
 num_cpus = {version = "1.1.0", optional = true}
 num-integer = "0.1"
 num-traits = "0.2"
 num-derive = "0.2"
 ordered-float = "1.0"
 owning_ref = "0.3.3"
 parking_lot = "0.6"
 precomputed-hash = "0.1.1"
--- a/servo/ports/geckolib/Cargo.toml
+++ b/servo/ports/geckolib/Cargo.toml
@@ -14,16 +14,16 @@ gecko_debug = ["style/gecko_debug", "nss
 
 [dependencies]
 atomic_refcell = "0.1"
 cssparser = "0.25"
 cstr = "0.1.2"
 libc = "0.2"
 log = {version = "0.4", features = ["release_max_level_info"]}
 malloc_size_of = {path = "../../components/malloc_size_of"}
-nsstring = {path = "../../support/gecko/nsstring"}
+nsstring = {path = "../../../xpcom/rust/nsstring/"}
 num-traits = "0.2"
 parking_lot = "0.6"
 selectors = {path = "../../components/selectors"}
 servo_arc = {path = "../../components/servo_arc"}
 smallvec = "0.6"
 style = {path = "../../components/style", features = ["gecko"]}
 style_traits = {path = "../../components/style_traits"}
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -3,18 +3,18 @@ name = "gkrust-shared"
 version = "0.1.0"
 authors = ["nobody@mozilla.org"]
 license = "MPL-2.0"
 description = "Shared Rust code for libxul"
 
 [dependencies]
 geckoservo = { path = "../../../../servo/ports/geckolib", optional = true }
 mp4parse_capi = { path = "../../../../media/mp4parse-rust/mp4parse_capi" }
-nsstring = { path = "../../../../servo/support/gecko/nsstring" }
 nserror = { path = "../../../../xpcom/rust/nserror" }
+nsstring = { path = "../../../../xpcom/rust/nsstring" }
 netwerk_helper = { path = "../../../../netwerk/base/rust-helper" }
 xpcom = { path = "../../../../xpcom/rust/xpcom" }
 prefs_parser = { path = "../../../../modules/libpref/parser" }
 profiler_helper = { path = "../../../../tools/profiler/rust-helper", optional = true }
 mozurl = { path = "../../../../netwerk/base/mozurl" }
 webrender_bindings = { path = "../../../../gfx/webrender_bindings", optional = true }
 cubeb-pulse = { path = "../../../../media/libcubeb/cubeb-pulse-rs", optional = true, features=["pulse-dlopen"] }
 cubeb-sys = { version = "0.5.0", optional = true, features=["gecko-in-tree"] }
--- a/xpcom/rust/gtest/nsstring/Cargo.toml
+++ b/xpcom/rust/gtest/nsstring/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "nsstring-gtest"
 version = "0.1.0"
 authors = ["nobody@mozilla.com"]
 license = "MPL-2.0"
 description = "Tests for rust bindings to xpcom string types"
 
 [dependencies]
-nsstring = { path = "../../../../servo/support/gecko/nsstring" }
+nsstring = { path = "../../nsstring" }
 
 [lib]
 path = "test.rs"
--- a/xpcom/rust/gtest/xpcom/Cargo.toml
+++ b/xpcom/rust/gtest/xpcom/Cargo.toml
@@ -3,12 +3,12 @@ name = "xpcom-gtest"
 version = "0.1.0"
 authors = ["michael@thelayzells.com"]
 license = "MPL-2.0"
 description = "Tests for rust bindings to xpcom interfaces"
 
 [dependencies]
 xpcom = { path = "../../xpcom" }
 nserror = { path = "../../nserror" }
-nsstring = { path = "../../../../servo/support/gecko/nsstring" }
+nsstring = { path = "../../nsstring" }
 
 [lib]
 path = "test.rs"
--- a/xpcom/rust/nserror/Cargo.toml
+++ b/xpcom/rust/nserror/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "nserror"
 version = "0.1.0"
 authors = ["Michael Layzell <michael@thelayzells.com>"]
 license = "MPL-2.0"
 description = "Rust bindings to xpcom nsresult and NS_ERROR_ values"
 
 [dependencies]
-nsstring = { path = "../../../servo/support/gecko/nsstring" }
+nsstring = { path = "../nsstring" }
rename from servo/support/gecko/nsstring/Cargo.toml
rename to xpcom/rust/nsstring/Cargo.toml
rename from servo/support/gecko/nsstring/src/conversions.rs
rename to xpcom/rust/nsstring/src/conversions.rs
rename from servo/support/gecko/nsstring/src/lib.rs
rename to xpcom/rust/nsstring/src/lib.rs
--- a/xpcom/rust/xpcom/Cargo.toml
+++ b/xpcom/rust/xpcom/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "xpcom"
 version = "0.1.0"
 authors = ["michael@thelayzells.com"]
 
 [dependencies]
 libc = "0.2"
-nsstring = { path = "../../../servo/support/gecko/nsstring" }
+nsstring = { path = "../nsstring" }
 nserror = { path = "../nserror" }
 xpcom_macros = { path = "xpcom_macros" }