Use workspace definitions for all crates and update to the 2021 editi…

…on (#32544)
servo · Jun 18, 2024 · 4a7f3ba · 4a7f3ba
1 parent 42b09d4
commit 4a7f3ba
Show file tree

Hide file tree

Showing 60 changed files with 283 additions and 268 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,6 +9,13 @@ members = [
 default-members = ["ports/servoshell"]
 exclude = [".cargo"]
 
+[workspace.package]
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
+edition = "2021"
+publish = false
+
 [workspace.dependencies]
 accountable-refcell = "0.2.0"
 app_units = "0.7"

diff --git a/components/allocator/Cargo.toml b/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"

diff --git a/components/background_hang_monitor/Cargo.toml b/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"

diff --git a/components/bluetooth/Cargo.toml b/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"

diff --git a/components/canvas/Cargo.toml b/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"

diff --git a/components/compositing/Cargo.toml b/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"

diff --git a/components/config/Cargo.toml b/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"

diff --git a/components/config_plugins/Cargo.toml b/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"

diff --git a/components/constellation/Cargo.toml b/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"

diff --git a/components/deny_public_fields/Cargo.toml b/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"

diff --git a/components/devtools/Cargo.toml b/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"

diff --git a/components/dom_struct/Cargo.toml b/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 }

diff --git a/components/domobject_derive/Cargo.toml b/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"

diff --git a/components/geometry/Cargo.toml b/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"

diff --git a/components/gfx/Cargo.toml b/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"

diff --git a/components/hyper_serde/Cargo.toml b/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"

diff --git a/components/jstraceable_derive/Cargo.toml b/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"

diff --git a/components/jstraceable_derive/lib.rs b/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);))

diff --git a/components/layout/Cargo.toml b/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"

diff --git a/components/layout_2020/Cargo.toml b/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"

diff --git a/components/layout_thread/Cargo.toml b/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"

diff --git a/components/layout_thread_2020/Cargo.toml b/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"

diff --git a/components/media/Cargo.toml b/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"

diff --git a/components/metrics/Cargo.toml b/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"

diff --git a/components/net/Cargo.toml b/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]