diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-09-22 13:35:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-22 13:35:15 -0400 |
| commit | 7287ea4c858ebd5633565879e0ec7470fe7993dc (patch) | |
| tree | eceaac6404793077c0c237929c6c960375190c25 | |
| parent | cc53ec805d0a96fbe4e53f0a719448bac0b07aa7 (diff) | |
| parent | 1954a0a1a1fb8781ccf5de4f0342c11fc9fdfce5 (diff) | |
| download | servo-7287ea4c858ebd5633565879e0ec7470fe7993dc.tar.gz servo-7287ea4c858ebd5633565879e0ec7470fe7993dc.zip | |
Auto merge of #21788 - emilio:smallvec-union-not-quite-there-yet, r=asajeffrey
Partially revert #21746.
This reverts the relevant bits from #21746 so that style and dependencies can
build with stable.
This is important because:
* `selectors` is a published crate.
* Gecko compiles with stable (more or less).
I reviewed that PR under the assumption that the union feature was stable, since
untagged unions are stable since 1.19, but turns out that smallvec uses non-Copy
types in unions, which are still unstable.
This leaves the union feature used on Servo, so that it gets testing, taking
advantage of features being additive.
<!-- 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/21788)
<!-- Reviewable:end -->
| -rw-r--r-- | components/fallible/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/malloc_size_of/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/selectors/Cargo.toml | 2 | ||||
| -rw-r--r-- | components/style/Cargo.toml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/components/fallible/Cargo.toml b/components/fallible/Cargo.toml index 7b5291304be..e8f5314693b 100644 --- a/components/fallible/Cargo.toml +++ b/components/fallible/Cargo.toml @@ -10,7 +10,7 @@ name = "fallible" path = "lib.rs" [dependencies] -smallvec = { version = "0.6", features = ["std", "union"] } +smallvec = "0.6" hashglobe = { path = "../hashglobe" } # This crate effectively does nothing except if the `known_system_malloc` diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index 7ecb2d59422..cd05b5d50c0 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -37,7 +37,7 @@ serde_bytes = { version = "0.10", optional = true } servo_arc = { path = "../servo_arc" } servo_channel = { path = "../channel", optional = true } smallbitvec = "2.1.0" -smallvec = { version = "0.6", features = ["std", "union"] } +smallvec = "0.6" string_cache = { version = "0.7", optional = true } thin-slice = "0.1.0" time = { version = "0.1.17", optional = true } diff --git a/components/selectors/Cargo.toml b/components/selectors/Cargo.toml index 76cb50bcf82..f7a0a6a85ce 100644 --- a/components/selectors/Cargo.toml +++ b/components/selectors/Cargo.toml @@ -28,7 +28,7 @@ fxhash = "0.2" phf = "0.7.18" precomputed-hash = "0.1" servo_arc = { version = "0.1", path = "../servo_arc" } -smallvec = { version = "0.6", features = ["std", "union"] } +smallvec = "0.6" thin-slice = "0.1.0" [build-dependencies] diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 3c975d7520c..1b41545dcae 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -62,7 +62,7 @@ servo_atoms = {path = "../atoms", optional = true} servo_channel = {path = "../channel", optional = true} servo_config = {path = "../config", optional = true} smallbitvec = "2.1.1" -smallvec = { version = "0.6", features = ["std", "union"] } +smallvec = "0.6" string_cache = { version = "0.7", optional = true } style_derive = {path = "../style_derive"} style_traits = {path = "../style_traits"} |