cargo: Rename workspace-local dependencies starting with c to servo-* (#43615)

Also reorders alphabetically for the corresponding user .toml.

Similar to #43526.

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>

Cargo.toml

@@ -229,10 +229,6 @@ xml5ever = "0.39"
 # be listed here, between the `Begin` and `End` comments, so that we can easily find and
 # update the version requirements when bumping the workspace version.
 # Begin workspace-version dependencies - Don't change this comment, we grep for it in scripts!
-canvas = { package = "servo-canvas", version = "0.0.6", path = "components/canvas" }
-canvas_traits = { package = "servo-canvas-traits", version = "0.0.6", path = "components/shared/canvas" }
-constellation = { package = "servo-constellation", version = "0.0.6", path = "components/constellation" }
-constellation_traits = { package = "servo-constellation-traits", version = "0.0.6", path = "components/shared/constellation" }
 deny_public_fields = { package = "servo-deny-public-fields", version = "0.0.6", path = "components/deny_public_fields" }
 devtools = { package = "servo-devtools", version = "0.0.6", path = "components/devtools" }
 devtools_traits = { package = "servo-devtools-traits", version = "0.0.6", path = "components/shared/devtools" }
@@ -263,8 +259,12 @@ servo-background-hang-monitor-api = { version = "0.0.6", path = "components/shar
 servo-base = { version = "0.0.6", path = "components/shared/base" }
 servo-bluetooth = { version = "0.0.6", path = "components/bluetooth" }
 servo-bluetooth-traits = { version = "0.0.6", path = "components/shared/bluetooth" }
+servo-canvas = { version = "0.0.6", path = "components/canvas" }
+servo-canvas-traits = { version = "0.0.6", path = "components/shared/canvas" }
 servo-config = { version = "0.0.6", path = "components/config" }
 servo-config-macro = { version = "0.0.6", path = "components/config/macro" }
+servo-constellation = { version = "0.0.6", path = "components/constellation" }
+servo-constellation-traits = { version = "0.0.6", path = "components/shared/constellation" }
 servo-geometry = { version = "0.0.6", path = "components/geometry" }
 servo-media = { version = "0.0.6", path = "components/media/servo-media" }
 servo-media-audio = { version = "0.0.6", path = "components/media/audio" }

components/canvas/Cargo.toml

@@ -19,7 +19,6 @@ vello = ["dep:vello", "dep:pollster", "dep:futures-intrusive"]
 
 [dependencies]
 bytemuck = { workspace = true, features = ["extern_crate_alloc"] }
-canvas_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
 euclid = { workspace = true }
 fonts = { workspace = true }
@@ -33,6 +32,7 @@ pollster = { version = "0.4", optional = true }
 profile_traits = { workspace = true }
 rustc-hash = { workspace = true }
 servo-base = { workspace = true }
+servo-canvas-traits = { workspace = true }
 servo-config = { workspace = true }
 servo-tracing = { workspace = true }
 stylo = { workspace = true }

components/constellation/Cargo.toml

@@ -17,8 +17,8 @@ path = "lib.rs"
 default = []
 bluetooth = ["servo-bluetooth-traits"]
 gamepad = ["embedder_traits/gamepad"]
-tracing = ["dep:tracing", "canvas/tracing"]
-vello = ["canvas/vello"]
+tracing = ["dep:tracing", "servo-canvas/tracing"]
+vello = ["servo-canvas/vello"]
 webgpu = ["script_traits/webgpu"]
 
 [lints.clippy]
@@ -27,9 +27,6 @@ panic = "deny"
 
 [dependencies]
 backtrace = { workspace = true }
-canvas = { workspace = true }
-canvas_traits = { workspace = true }
-constellation_traits = { workspace = true }
 content-security-policy = { workspace = true }
 crossbeam-channel = { workspace = true }
 devtools_traits = { workspace = true }
@@ -54,7 +51,10 @@ servo-background-hang-monitor = { workspace = true }
 servo-background-hang-monitor-api = { workspace = true }
 servo-base = { workspace = true }
 servo-bluetooth-traits = { workspace = true, optional = true }
+servo-canvas = { workspace = true }
+servo-canvas-traits = { workspace = true }
 servo-config = { workspace = true }
+servo-constellation-traits = { workspace = true }
 servo-tracing = { workspace = true }
 servo-url = { workspace = true }
 storage_traits = { workspace = true }

components/paint/Cargo.toml

@@ -25,8 +25,6 @@ panic = "deny"
 
 [dependencies]
 bitflags = { workspace = true }
-canvas_traits = { workspace = true }
-constellation_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
 dpi = { workspace = true }
 embedder_traits = { workspace = true }
@@ -43,7 +41,9 @@ rayon = { workspace = true }
 rustc-hash = { workspace = true }
 servo-allocator = { workspace = true }
 servo-base = { workspace = true }
+servo-canvas-traits = { workspace = true }
 servo-config = { workspace = true }
+servo-constellation-traits = { workspace = true }
 servo-geometry = { workspace = true }
 servo-tracing = { workspace = true }
 smallvec = { workspace = true }

components/script/Cargo.toml

@@ -26,7 +26,7 @@ profilemozjs = ['js/profilemozjs']
 refcell_backtrace = ["accountable-refcell"]
 testbinding = ["script_bindings/testbinding"]
 tracing = ["dep:tracing", "script_bindings/tracing"]
-webgl_backtrace = ["canvas_traits/webgl_backtrace"]
+webgl_backtrace = ["servo-canvas-traits/webgl_backtrace"]
 webgpu = ["script_bindings/webgpu", "script_traits/webgpu"]
 webxr = ["gamepad", "webxr-api", "script_bindings/webxr"]
 
@@ -48,13 +48,11 @@ base64 = { workspace = true }
 base64ct = { workspace = true }
 bitflags = { workspace = true }
 brotli = { workspace = true }
-canvas_traits = { workspace = true }
 cbc = { workspace = true }
 chacha20poly1305 = { workspace = true }
 chardetng = { workspace = true }
 chrono = { workspace = true }
 cipher = { workspace = true }
-constellation_traits = { workspace = true }
 content-security-policy = { workspace = true }
 cookie = { workspace = true }
 crossbeam-channel = { workspace = true }
@@ -130,7 +128,9 @@ serde_json = { workspace = true, features = ["preserve_order"] }
 servo-background-hang-monitor-api = { workspace = true }
 servo-base = { workspace = true }
 servo-bluetooth-traits = { workspace = true, optional = true }
+servo-canvas-traits = { workspace = true }
 servo-config = { workspace = true }
+servo-constellation-traits = { workspace = true }
 servo-geometry = { workspace = true }
 servo-media = { workspace = true }
 servo-url = { workspace = true }

components/servo/Cargo.toml

@@ -22,8 +22,8 @@ background_hang_monitor = ["servo-background-hang-monitor/sampler"]
 bluetooth = [
     "servo-bluetooth-traits",
     "dep:servo-bluetooth",
-    "constellation/bluetooth",
-    "constellation_traits/bluetooth",
+    "servo-constellation/bluetooth",
+    "servo-constellation-traits/bluetooth",
     "script/bluetooth",
     "script_traits/bluetooth",
 ]
@@ -33,7 +33,7 @@ debugmozjs = ["script/debugmozjs"]
 dynamic_freetype = ["webrender/dynamic_freetype"]
 gamepad = [
     "script/gamepad",
-    "constellation/gamepad",
+    "servo-constellation/gamepad",
     "embedder_traits/gamepad",
 ]
 jitspew = ["script/jitspew"]
@@ -48,23 +48,23 @@ testbinding = ["script/testbinding"]
 tracing = [
     "dep:tracing",
     "paint/tracing",
-    "constellation/tracing",
+    "servo-constellation/tracing",
     "fonts/tracing",
     "layout/tracing",
     "profile_traits/tracing",
     "script/tracing",
 ]
-vello = ["constellation/vello"]
+vello = ["servo-constellation/vello"]
 webgl_backtrace = [
     "script/webgl_backtrace",
     "webgl/webgl_backtrace",
-    "canvas_traits/webgl_backtrace",
+    "servo-canvas-traits/webgl_backtrace",
 ]
 webgpu = [
     "script/webgpu",
     "paint/webgpu",
-    "constellation/webgpu",
-    "constellation_traits/webgpu",
+    "servo-constellation/webgpu",
+    "servo-constellation-traits/webgpu",
 ]
 webxr = [
     "dep:webxr",
@@ -77,9 +77,6 @@ webxr = [
 [dependencies]
 accesskit = { workspace = true }
 bitflags = { workspace = true }
-canvas_traits = { workspace = true }
-constellation = { workspace = true }
-constellation_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
 devtools = { workspace = true }
 devtools_traits = { workspace = true }
@@ -112,7 +109,10 @@ servo-background-hang-monitor = { workspace = true }
 servo-base = { workspace = true }
 servo-bluetooth = { workspace = true, optional = true }
 servo-bluetooth-traits = { workspace = true, optional = true }
+servo-canvas-traits = { workspace = true }
 servo-config = { workspace = true }
+servo-constellation = { workspace = true }
+servo-constellation-traits = { workspace = true }
 servo-geometry = { workspace = true }
 servo-media = { workspace = true }
 servo-media-dummy = { workspace = true }

components/shared/constellation/Cargo.toml

@@ -18,7 +18,6 @@ bluetooth = []
 webgpu = ["wgpu-core"]
 
 [dependencies]
-canvas_traits = { workspace = true }
 content-security-policy = { workspace = true }
 devtools_traits = { workspace = true }
 embedder_traits = { workspace = true }
@@ -38,6 +37,7 @@ profile_traits = { workspace = true }
 rustc-hash = { workspace = true }
 serde = { workspace = true }
 servo-base = { workspace = true }
+servo-canvas-traits = { workspace = true }
 servo-config = { workspace = true }
 servo-url = { workspace = true }
 storage_traits = { workspace = true }

components/shared/script/Cargo.toml

@@ -19,8 +19,6 @@ webgpu = ["webgpu_traits"]
 
 [dependencies]
 accesskit = { workspace = true }
-canvas_traits = { workspace = true }
-constellation_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
 devtools_traits = { workspace = true }
 embedder_traits = { workspace = true }
@@ -38,7 +36,9 @@ rustc-hash = { workspace = true }
 serde = { workspace = true }
 servo-base = { workspace = true }
 servo-bluetooth-traits = { workspace = true, optional = true }
+servo-canvas-traits = { workspace = true }
 servo-config = { workspace = true }
+servo-constellation-traits = { workspace = true }
 servo-url = { workspace = true }
 storage_traits = { workspace = true }
 strum = { workspace = true }

components/webgl/Cargo.toml

@@ -14,13 +14,12 @@ name = "webgl"
 path = "lib.rs"
 
 [features]
-webgl_backtrace = ["canvas_traits/webgl_backtrace"]
+webgl_backtrace = ["servo-canvas-traits/webgl_backtrace"]
 webxr = ["dep:webxr", "dep:webxr-api"]
 
 [dependencies]
 bitflags = { workspace = true }
 byteorder = { workspace = true }
-canvas_traits = { workspace = true }
 crossbeam-channel = { workspace = true }
 euclid = { workspace = true }
 glow = { workspace = true }
@@ -32,6 +31,7 @@ parking_lot = { workspace = true }
 pixels = { workspace = true }
 rustc-hash = { workspace = true }
 servo-base = { workspace = true }
+servo-canvas-traits = { workspace = true }
 surfman = { workspace = true }
 webrender_api = { workspace = true }
 webxr = { workspace = true, optional = true }