Auto merge of #18941 - mystor:nsstring, r=mystor

Move nsstring from gecko into servo/support/gecko/nsstring

This is the servo side of bug 1403213.

This cannot merge until https://bugzilla.mozilla.org/show_bug.cgi?id=1377351 merges. It is currently on inbound. This will break autoland when it merges until the gecko-side part has also landed.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18941)
<!-- Reviewable:end -->

components/style/Cargo.toml

@@ -16,7 +16,7 @@ path = "lib.rs"
 doctest = false
 
 [features]
-gecko = ["nsstring_vendor", "num_cpus",
+gecko = ["nsstring", "num_cpus",
          "style_traits/gecko", "fallible/known_system_malloc"]
 use_bindgen = ["bindgen", "regex", "toml"]
 servo = ["serde", "style_traits/servo", "servo_atoms", "servo_config", "html5ever",
@@ -26,7 +26,7 @@ servo = ["serde", "style_traits/servo", "servo_atoms", "servo_config", "html5eve
          #"arrayvec/use_union"
 
          "servo_url"]
-gecko_debug = ["nsstring_vendor/gecko_debug"]
+gecko_debug = ["nsstring/gecko_debug"]
 
 [dependencies]
 app_units = "0.5.5"
@@ -50,7 +50,7 @@ log = "0.3"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = { path = "../malloc_size_of_derive" }
 matches = "0.1"
-nsstring_vendor = {path = "gecko_bindings/nsstring_vendor", optional = true}
+nsstring = {path = "../../support/gecko/nsstring", optional = true}
 num_cpus = {version = "1.1.0", optional = true}
 num-integer = "0.1.32"
 num-traits = "0.1.32"

components/style/gecko_bindings/nsstring_vendor/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "nsstring_vendor"
-version = "0.1.0"
-authors = ["nobody@mozilla.com"]
-license = "MPL-2.0"
-description = "Rust bindings to xpcom string types"
-
-
-# Revendoring nsstring from m-c into Servo
-
-[dependencies]
-bitflags = "0.8"
-
-[features]
-gecko_debug = []

components/style/lib.rs

@@ -64,7 +64,7 @@ extern crate lru_cache;
 #[macro_use]
 extern crate matches;
 #[cfg(feature = "gecko")]
-pub extern crate nsstring_vendor as nsstring;
+pub extern crate nsstring;
 #[cfg(feature = "gecko")] extern crate num_cpus;
 extern crate num_integer;
 extern crate num_traits;