Use workspace definitions for all crates and update to the 2021 edition (#32544)

components/allocator/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "servo_allocator"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 path = "lib.rs"

components/background_hang_monitor/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "background_hang_monitor"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-publish = false
-edition = "2018"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "background_hang_monitor"

components/bluetooth/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "bluetooth"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "bluetooth"

components/canvas/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "canvas"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "canvas"

components/compositing/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "compositing"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
 build = "build.rs"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "compositing"

components/config/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "servo_config"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "servo_config"

components/config_plugins/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "servo_config_plugins"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "servo_config_plugins"

components/constellation/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "constellation"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "constellation"

components/deny_public_fields/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "deny_public_fields"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 path = "lib.rs"

components/devtools/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "devtools"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "devtools"

components/dom_struct/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
 name = "dom_struct"
-edition = "2018"
-publish = false
-version = "0.0.1"
+edition.workspace = true
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+publish.workspace = true
 
 [dependencies]
 quote = { workspace = true }

components/domobject_derive/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "domobject_derive"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+edition.workspace = true
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+publish.workspace = true
 
 [lib]
 path = "lib.rs"

components/geometry/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "servo_geometry"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "servo_geometry"

components/gfx/Cargo.toml

@@ -1,11 +1,10 @@
 [package]
-
 name = "gfx"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "gfx"

components/hyper_serde/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "hyper_serde"
 version = "0.13.2"
-edition = "2018"
+edition.workspace = true
 authors = ["The Servo Project Developers"]
 description = "Serde support for hyper types."
 license = "MIT OR Apache-2.0"

components/jstraceable_derive/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "jstraceable_derive"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+edition.workspace = true
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+publish.workspace = true
 
 [lib]
 path = "lib.rs"

components/jstraceable_derive/lib.rs

@@ -157,7 +157,7 @@ fn js_traceable_derive(s: synstructure::Structure) -> proc_macro2::TokenStream {
                 }
                 return None;
             } else if attr.path().is_ident("custom_trace") {
-                return Some(quote!(<crate::dom::bindings::trace::CustomTraceable>::trace(#binding, tracer);));
+                return Some(quote!(<dyn crate::dom::bindings::trace::CustomTraceable>::trace(#binding, tracer);));
             }
         }
         Some(quote!(#binding.trace(tracer);))

components/layout/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "layout_2013"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "layout_2013"

components/layout_2020/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "layout_2020"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "layout_2020"

components/layout_thread/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "layout_thread_2013"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "layout_thread_2013"

components/layout_thread_2020/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "layout_thread_2020"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "layout_thread_2020"

components/media/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "media"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "media"

components/metrics/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "metrics"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "metrics"

components/net/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "net"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 autotests = false # Inhibit lookup for tests/*.rs without [[test]] sections
 
 [lib]

components/pixels/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "pixels"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "pixels"

components/profile/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "profile"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "profile"

components/rand/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "servo_rand"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "servo_rand"

components/range/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "range"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "range"

components/script/Cargo.toml

@@ -1,12 +1,11 @@
 [package]
 name = "script"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
-
 build = "build.rs"
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "script"

components/script/dom/htmlscriptelement.rs

@@ -116,8 +116,12 @@ unsafe extern "C" fn off_thread_compilation_callback(
             let cx = GlobalScope::get_cx();
             let _ar = enter_realm(&*global);
 
-            let compiled_script = FinishOffThreadStencil(*cx, token.0, ptr::null_mut());
+            // TODO: This is necessary because the rust compiler will otherwise try to move the *mut
+            // OffThreadToken directly, which isn't marked as Send. The correct fix is that this
+            // type is marked as Send in mozjs.
+            let used_token = token;
 
+            let compiled_script = FinishOffThreadStencil(*cx, used_token.0, ptr::null_mut());
             let load = if compiled_script.is_null() {
                 Err(NoTrace(NetworkError::Internal(
                     "Off-thread compilation failed.".into(),

components/script/dom/macros.rs

@@ -157,7 +157,7 @@ macro_rules! make_labels_getter(
 
 #[macro_export]
 macro_rules! make_enumerated_getter(
-    ( $attr:ident, $htmlname:tt, $default:expr, $($choices: pat)|+) => (
+    ( $attr:ident, $htmlname:tt, $default:expr, $($choices:pat_param)|+) => (
         fn $attr(&self) -> DOMString {
             use $crate::dom::bindings::inheritance::Castable;
             use $crate::dom::element::Element;

components/servo/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "libservo"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "servo"

components/shared/background_hang_monitor/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "background_hang_monitor_api"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "background_hang_monitor_api"

components/shared/base/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "base"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "base"

components/shared/bluetooth/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "bluetooth_traits"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "bluetooth_traits"

components/shared/canvas/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "canvas_traits"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "canvas_traits"

components/shared/compositing/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "compositing_traits"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "compositing_traits"

components/shared/devtools/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "devtools_traits"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "devtools_traits"

components/shared/embedder/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "embedder_traits"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "embedder_traits"

components/shared/gfx/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "gfx_traits"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "gfx_traits"

components/shared/net/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "net_traits"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "net_traits"

components/shared/profile/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "profile_traits"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "profile_traits"

components/shared/script/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "script_traits"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "script_traits"

components/shared/script_layout/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "script_layout_interface"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "script_layout_interface"

components/shared/webrender/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "webrender_traits"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "webrender_traits"

components/url/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "servo_url"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "servo_url"

components/webdriver_server/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "webdriver_server"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "webdriver_server"

components/webgpu/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "webgpu"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-edition = "2018"
-publish = false
+version.workspace = true
+authors.workspace = true
+license.workspace = true
+edition.workspace = true
+publish.workspace = true
 
 [lib]
 name = "webgpu"