From 5b26f3c92e698234ca3b5b54a8d79ea87b3726f0 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Wed, 2 Oct 2019 12:24:21 +0000 Subject: [PATCH] servo: Merge #19476 - Use workspace.default-members to specify default crates for cargo build (from servo:default-members); r=nox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … 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: https://github.com/rust-lang/cargo/issues/4463 `workspace.default-members` was added in https://github.com/rust-lang/cargo/pull/4743. Older Cargo versions ignore it. Source-Repo: https://github.com/servo/servo Source-Revision: df68eea3f21cc3bbf24d5bbb66be42c4e3a9e427 UltraBlame original commit: d1606d726592e798d5cafba5cbbf0f8326d67243 --- servo/Cargo.lock | 120 -------- servo/Cargo.toml | 34 ++- servo/components/dom_struct/lib.rs | 38 +++ servo/ports/geckolib/Cargo.toml | 24 -- .../stylo => ports/geckolib/tests}/Cargo.toml | 0 .../stylo => ports/geckolib/tests}/build.rs | 0 .../stylo => ports/geckolib/tests}/lib.rs | 0 .../tests}/servo_function_signatures.rs | 0 .../stylo => ports/geckolib/tests}/size_of.rs | 0 .../geckolib/tests}/specified_values.rs | 0 servo/ports/servo/Cargo.toml | 276 ------------------ servo/python/servo/build_commands.py | 38 +-- servo/python/servo/devenv_commands.py | 15 + servo/python/servo/testing_commands.py | 29 ++ servo/rust-toolchain | 4 +- servo/tests/unit/gfx/lib.rs | 9 +- servo/tests/unit/layout/lib.rs | 30 ++ servo/tests/unit/metrics/lib.rs | 22 +- servo/tests/unit/msg/lib.rs | 30 ++ servo/tests/unit/net/lib.rs | 104 +------ servo/tests/unit/net_traits/lib.rs | 16 +- servo/tests/unit/profile/Cargo.toml | 12 - servo/tests/unit/profile/lib.rs | 15 +- servo/tests/unit/style/lib.rs | 12 +- 24 files changed, 236 insertions(+), 592 deletions(-) rename servo/{tests/unit/stylo => ports/geckolib/tests}/Cargo.toml (100%) rename servo/{tests/unit/stylo => ports/geckolib/tests}/build.rs (100%) rename servo/{tests/unit/stylo => ports/geckolib/tests}/lib.rs (100%) rename servo/{tests/unit/stylo => ports/geckolib/tests}/servo_function_signatures.rs (100%) rename servo/{tests/unit/stylo => ports/geckolib/tests}/size_of.rs (100%) rename servo/{tests/unit/stylo => ports/geckolib/tests}/specified_values.rs (100%) diff --git a/servo/Cargo.lock b/servo/Cargo.lock index 1f4b6fb03f2fa..9da7fac16422e 100644 --- a/servo/Cargo.lock +++ b/servo/Cargo.lock @@ -13437,14 +13437,6 @@ style_traits . 1 " -" -stylo_tests -0 -. -0 -. -1 -" ] [ [ @@ -36927,22 +36919,6 @@ crate ) " " -deny_public_fields_tests -0 -. -0 -. -1 -" -" -gfx_tests -0 -. -0 -. -1 -" -" glutin_app 0 . @@ -36951,14 +36927,6 @@ glutin_app 1 " " -layout_tests -0 -. -0 -. -1 -" -" libservo 0 . @@ -36996,86 +36964,6 @@ index ) " " -malloc_size_of_tests -0 -. -0 -. -1 -" -" -metrics_tests -0 -. -0 -. -1 -" -" -msg_tests -0 -. -0 -. -1 -" -" -net_tests -0 -. -0 -. -1 -" -" -net_traits_tests -0 -. -0 -. -1 -" -" -profile_tests -0 -. -0 -. -1 -" -" -script_plugins_tests -0 -. -0 -. -1 -" -" -script_tests -0 -. -0 -. -1 -" -" -servo_config_tests -0 -. -0 -. -1 -" -" -servo_remutex_tests -0 -. -0 -. -1 -" -" sig 0 . @@ -37104,14 +36992,6 @@ io index ) " -" -style_tests -0 -. -0 -. -1 -" ] [ [ diff --git a/servo/Cargo.toml b/servo/Cargo.toml index 8ee1e18017109..fb604db2266ed 100644 --- 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 index 4b2ff2c5058ae..536da8c02f52a 100644 --- 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 index f137d0018384e..d7f5af6bce3e9 100644 --- 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 b/servo/ports/geckolib/tests/Cargo.toml similarity index 100% rename from servo/tests/unit/stylo/Cargo.toml rename to servo/ports/geckolib/tests/Cargo.toml diff --git a/servo/tests/unit/stylo/build.rs b/servo/ports/geckolib/tests/build.rs similarity index 100% rename from servo/tests/unit/stylo/build.rs rename to servo/ports/geckolib/tests/build.rs diff --git a/servo/tests/unit/stylo/lib.rs b/servo/ports/geckolib/tests/lib.rs similarity index 100% rename from servo/tests/unit/stylo/lib.rs rename to servo/ports/geckolib/tests/lib.rs diff --git a/servo/tests/unit/stylo/servo_function_signatures.rs b/servo/ports/geckolib/tests/servo_function_signatures.rs similarity index 100% rename from servo/tests/unit/stylo/servo_function_signatures.rs rename to servo/ports/geckolib/tests/servo_function_signatures.rs diff --git a/servo/tests/unit/stylo/size_of.rs b/servo/ports/geckolib/tests/size_of.rs similarity index 100% rename from servo/tests/unit/stylo/size_of.rs rename to servo/ports/geckolib/tests/size_of.rs diff --git a/servo/tests/unit/stylo/specified_values.rs b/servo/ports/geckolib/tests/specified_values.rs similarity index 100% rename from servo/tests/unit/stylo/specified_values.rs rename to servo/ports/geckolib/tests/specified_values.rs diff --git a/servo/ports/servo/Cargo.toml b/servo/ports/servo/Cargo.toml index 6f7a2533e5851..d9749182667ee 100644 --- a/servo/ports/servo/Cargo.toml +++ b/servo/ports/servo/Cargo.toml @@ -68,277 +68,6 @@ bench = false [ -dev -- -dependencies -] -deny_public_fields_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -deny_public_fields -" -} -gfx_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -gfx -" -} -layout_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -layout -" -} -malloc_size_of_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -malloc_size_of -" -} -metrics_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -metrics -" -} -msg_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -msg -" -} -net_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -net -" -} -net_traits_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -net_traits -" -} -profile_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -profile -" -} -script_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -script -" -} -script_plugins_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -script_plugins -" -} -servo_config_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -servo_config -" -} -servo_remutex_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -servo_remutex -" -} -style_tests -= -{ -path -= -" -. -. -/ -. -. -/ -tests -/ -unit -/ -style -" -} -[ features ] default @@ -435,11 +164,6 @@ libservo / unstable " -" -profile_tests -/ -unstable -" ] [ dependencies diff --git a/servo/python/servo/build_commands.py b/servo/python/servo/build_commands.py index fba6f127c1c8c..f39161d8a26ad 100644 --- a/servo/python/servo/build_commands.py +++ b/servo/python/servo/build_commands.py @@ -3505,24 +3505,13 @@ opts = [ -] - -opts -+ -= -[ " - -- -manifest -- -path +p +" +" +embedding " -self -. -cef_manifest -( -) ] if @@ -3953,24 +3942,13 @@ opts = [ -] - -opts -+ -= -[ " - -- -manifest -- -path +p +" +" +geckoservo " -self -. -geckolib_manifest -( -) ] features diff --git a/servo/python/servo/devenv_commands.py b/servo/python/servo/devenv_commands.py index ff303fd7bd6c4..290bea767dbfa 100644 --- a/servo/python/servo/devenv_commands.py +++ b/servo/python/servo/devenv_commands.py @@ -694,7 +694,22 @@ . run_cargo ( +[ +" +- +p +" +" +geckoservo +" +] ++ +( params +or +[ +] +) check = True diff --git a/servo/python/servo/testing_commands.py b/servo/python/servo/testing_commands.py index b56bcc86c3d17..3c96a095f7ff2 100644 --- a/servo/python/servo/testing_commands.py +++ b/servo/python/servo/testing_commands.py @@ -2154,6 +2154,35 @@ 1 " +# +Work +around +https +: +/ +/ +github +. +com +/ +rust +- +lang +/ +cargo +/ +issues +/ +4790 + +del +env +[ +" +RUSTDOCFLAGS +" +] + if " msvc diff --git a/servo/rust-toolchain b/servo/rust-toolchain index 5d6cbb74a8200..a0ba39cd1f1aa 100644 --- a/servo/rust-toolchain +++ b/servo/rust-toolchain @@ -2,6 +2,6 @@ nightly - 2017 - -11 +12 - -14 +07 diff --git a/servo/tests/unit/gfx/lib.rs b/servo/tests/unit/gfx/lib.rs index 849b4b7ba358f..3819851bc1548 100644 --- a/servo/tests/unit/gfx/lib.rs +++ b/servo/tests/unit/gfx/lib.rs @@ -56,17 +56,18 @@ MPL . * / -extern -crate -gfx -; # +! [ cfg ( test ) ] +extern +crate +gfx +; mod text_util ; diff --git a/servo/tests/unit/layout/lib.rs b/servo/tests/unit/layout/lib.rs index 8b83027386aeb..ab8afada3c067 100644 --- a/servo/tests/unit/layout/lib.rs +++ b/servo/tests/unit/layout/lib.rs @@ -56,12 +56,42 @@ MPL . * / +# +[ +cfg +( +all +( +test +target_pointer_width += +" +64 +" +) +) +] extern crate layout ; # [ +cfg +( +all +( +test +target_pointer_width += +" +64 +" +) +) +] +# +[ macro_use ] extern diff --git a/servo/tests/unit/metrics/lib.rs b/servo/tests/unit/metrics/lib.rs index d37a739cddc9b..7a90e918f7f23 100644 --- a/servo/tests/unit/metrics/lib.rs +++ b/servo/tests/unit/metrics/lib.rs @@ -56,6 +56,14 @@ MPL . * / +# +! +[ +cfg +( +test +) +] extern crate euclid @@ -96,23 +104,9 @@ extern crate time ; -# -[ -cfg -( -test -) -] mod interactive_time ; -# -[ -cfg -( -test -) -] mod paint_time ; diff --git a/servo/tests/unit/msg/lib.rs b/servo/tests/unit/msg/lib.rs index 59ec372dd1fed..b43d6ac1baec8 100644 --- a/servo/tests/unit/msg/lib.rs +++ b/servo/tests/unit/msg/lib.rs @@ -56,12 +56,42 @@ MPL . * / +# +[ +cfg +( +all +( +test +target_pointer_width += +" +64 +" +) +) +] extern crate msg ; # [ +cfg +( +all +( +test +target_pointer_width += +" +64 +" +) +) +] +# +[ macro_use ] extern diff --git a/servo/tests/unit/net/lib.rs b/servo/tests/unit/net/lib.rs index 7c183d3fb0f4a..6e78b5cac15f8 100644 --- a/servo/tests/unit/net/lib.rs +++ b/servo/tests/unit/net/lib.rs @@ -56,6 +56,14 @@ MPL . * / +# +! +[ +cfg +( +test +) +] extern crate cookie @@ -122,123 +130,39 @@ extern crate url ; -# -[ -cfg -( -test -) -] mod chrome_loader ; -# -[ -cfg -( -test -) -] mod cookie ; -# -[ -cfg -( -test -) -] mod cookie_http_state ; -# -[ -cfg -( -test -) -] mod data_loader ; -# -[ -cfg -( -test -) -] -mod -file_loader -; -# -[ -cfg -( -test -) -] mod fetch ; -# -[ -cfg -( -test -) -] mod -mime_classifier +file_loader ; -# -[ -cfg -( -test -) -] mod -resource_thread +filemanager_thread ; -# -[ -cfg -( -test -) -] mod hsts ; -# -[ -cfg -( -test -) -] mod http_loader ; -# -[ -cfg -( -test -) -] mod -filemanager_thread +mime_classifier +; +mod +resource_thread ; -# -[ -cfg -( -test -) -] mod subresource_integrity ; diff --git a/servo/tests/unit/net_traits/lib.rs b/servo/tests/unit/net_traits/lib.rs index e6a9001ec8a48..fe5bdf8c36db2 100644 --- a/servo/tests/unit/net_traits/lib.rs +++ b/servo/tests/unit/net_traits/lib.rs @@ -56,27 +56,21 @@ MPL . * / -extern -crate -net_traits -; # +! [ cfg ( test ) ] +extern +crate +net_traits +; mod image ; -# -[ -cfg -( -test -) -] mod pub_domains ; diff --git a/servo/tests/unit/profile/Cargo.toml b/servo/tests/unit/profile/Cargo.toml index b6235d5979345..6da59ae477d49 100644 --- a/servo/tests/unit/profile/Cargo.toml +++ b/servo/tests/unit/profile/Cargo.toml @@ -53,18 +53,6 @@ doctest = false [ -features -] -unstable -= -[ -" -servo_allocator -/ -unstable -" -] -[ dependencies ] ipc diff --git a/servo/tests/unit/profile/lib.rs b/servo/tests/unit/profile/lib.rs index ad6392c04ee33..81c85b008a3df 100644 --- a/servo/tests/unit/profile/lib.rs +++ b/servo/tests/unit/profile/lib.rs @@ -56,6 +56,14 @@ MPL . * / +# +! +[ +cfg +( +test +) +] extern crate ipc_channel @@ -72,13 +80,6 @@ extern crate servo_allocator ; -# -[ -cfg -( -test -) -] mod time ; diff --git a/servo/tests/unit/style/lib.rs b/servo/tests/unit/style/lib.rs index a98e46199a3b8..a697533316f0b 100644 --- a/servo/tests/unit/style/lib.rs +++ b/servo/tests/unit/style/lib.rs @@ -186,7 +186,17 @@ path . . / -stylo +. +. +/ +. +. +/ +ports +/ +geckolib +/ +tests / specified_values .