servo: Merge #19476 - Use workspace.default-members to specify defaul…

…t crates for cargo build (from servo:default-members); r=nox … and 'cargo test', etc. Include Servo and its unit tests, but not Stylo because that would try to compile the style crate with incompatible feature flags: rust-lang/cargo#4463 `workspace.default-members` was added in rust-lang/cargo#4743. Older Cargo versions ignore it. Source-Repo: https://github.com/servo/servo Source-Revision: df68eea3f21cc3bbf24d5bbb66be42c4e3a9e427 UltraBlame original commit: d1606d726592e798d5cafba5cbbf0f8326d67243
marco-c · Oct 2, 2019 · 5b26f3c · 5b26f3c
1 parent 86a3dd4
commit 5b26f3c
Show file tree

Hide file tree

Showing 24 changed files with 236 additions and 592 deletions.
diff --git a/servo/Cargo.lock b/servo/Cargo.lock
diff --git a/servo/Cargo.toml b/servo/Cargo.toml
@@ -7,7 +7,14 @@ members
 "
 ports
 /
-cef
+servo
+"
+"
+tests
+/
+unit
+/
+*
 "
 "
 ports
@@ -17,8 +24,33 @@ geckolib
 "
 ports
 /
+geckolib
+/
+tests
+"
+"
+ports
+/
+cef
+"
+]
+default
+-
+members
+=
+[
+"
+ports
+/
 servo
 "
+"
+tests
+/
+unit
+/
+*
+"
 ]
 exclude
 =

diff --git a/servo/components/dom_struct/lib.rs b/servo/components/dom_struct/lib.rs
@@ -154,6 +154,44 @@ C
 ]
 }
 ;
+/
+/
+Work
+around
+https
+:
+/
+/
+github
+.
+com
+/
+rust
+-
+lang
+/
+rust
+/
+issues
+/
+46489
+let
+attributes
+=
+attributes
+.
+to_string
+(
+)
+.
+parse
+(
+)
+.
+unwrap
+(
+)
+;
 iter
 :
 :

diff --git a/servo/ports/geckolib/Cargo.toml b/servo/ports/geckolib/Cargo.toml
@@ -337,27 +337,3 @@ components
 style_traits
 "
 }
-[
-dev
--
-dependencies
-]
-stylo_tests
-=
-{
-path
-=
-"
-.
-.
-/
-.
-.
-/
-tests
-/
-unit
-/
-stylo
-"
-}
diff --git a/servo/tests/unit/stylo/Cargo.toml → servo/ports/geckolib/tests/Cargo.toml b/servo/tests/unit/stylo/Cargo.toml → servo/ports/geckolib/tests/Cargo.toml
diff --git a/servo/tests/unit/stylo/build.rs → servo/ports/geckolib/tests/build.rs b/servo/tests/unit/stylo/build.rs → servo/ports/geckolib/tests/build.rs
diff --git a/servo/tests/unit/stylo/lib.rs → servo/ports/geckolib/tests/lib.rs b/servo/tests/unit/stylo/lib.rs → servo/ports/geckolib/tests/lib.rs
diff --git a/...s/unit/stylo/servo_function_signatures.rs → ...ckolib/tests/servo_function_signatures.rs b/...s/unit/stylo/servo_function_signatures.rs → ...ckolib/tests/servo_function_signatures.rs
diff --git a/servo/tests/unit/stylo/size_of.rs → servo/ports/geckolib/tests/size_of.rs b/servo/tests/unit/stylo/size_of.rs → servo/ports/geckolib/tests/size_of.rs
diff --git a/servo/tests/unit/stylo/specified_values.rs → .../ports/geckolib/tests/specified_values.rs b/servo/tests/unit/stylo/specified_values.rs → .../ports/geckolib/tests/specified_values.rs