Dedupe dwrote

components/canvas/Cargo.toml

@@ -11,18 +11,17 @@ name = "canvas"
 path = "lib.rs"
 
 [features]
-webgl_backtrace = ["canvas_traits/webgl_backtrace"]
 no-wgl = ["surfman/sm-no-wgl"]
+webgl_backtrace = ["canvas_traits/webgl_backtrace"]
 xr-profile = ["webxr-api/profile", "time"]
 
-
 [dependencies]
 bitflags = "1.0"
 byteorder = "1"
-canvas_traits = {path = "../canvas_traits"}
+canvas_traits = { path = "../canvas_traits" }
 crossbeam-channel = "0.4"
 cssparser = "0.27"
-embedder_traits = {path = "../embedder_traits"}
+embedder_traits = { path = "../embedder_traits" }
 euclid = "0.20"
 fnv = "1.0"
 gleam = "0.11"
@@ -31,17 +30,17 @@ ipc-channel = "0.14"
 log = "0.4"
 lyon_geom = "0.14"
 num-traits = "0.2"
-raqote = {git = "https://github.com/jrmuizel/raqote"}
-time = { version = "0.1.0", optional = true }
-pixels = {path = "../pixels"}
-servo_config = {path = "../config"}
+pixels = { path = "../pixels" }
+raqote = { git = "https://github.com/jrmuizel/raqote" }
+servo_config = { path = "../config" }
 sparkle = "0.1.24"
-webrender = {git = "https://github.com/servo/webrender"}
-webrender_api = {git = "https://github.com/servo/webrender"}
-webrender_surfman = {path = "../webrender_surfman"}
-webrender_traits = {path = "../webrender_traits"}
-webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
-# NOTE: the sm-angle feature only enables angle on windows, not other platforms!
-surfman = { version = "0.2", features = ["sm-angle","sm-angle-default"] }
+# NOTE: the sm-angle feature only enables ANGLE on Windows, not other platforms!
+surfman = { version = "0.2", features = ["sm-angle", "sm-angle-default"] }
 surfman-chains = "0.3"
 surfman-chains-api = "0.2"
+time = { version = "0.1.0", optional = true }
+webrender = { git = "https://github.com/servo/webrender" }
+webrender_api = { git = "https://github.com/servo/webrender" }
+webrender_surfman = { path = "../webrender_surfman" }
+webrender_traits = { path = "../webrender_traits" }
+webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }

components/canvas_traits/Cargo.toml

@@ -22,11 +22,11 @@ ipc-channel = "0.14"
 lazy_static = "1"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
-pixels = {path = "../pixels"}
+pixels = { path = "../pixels" }
 serde = "1.0"
 serde_bytes = "0.11"
-servo_config = {path = "../config"}
+servo_config = { path = "../config" }
 sparkle = "0.1"
 time = { version = "0.1.0", optional = true }
-webrender_api = {git = "https://github.com/servo/webrender"}
-webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
+webrender_api = { git = "https://github.com/servo/webrender" }
+webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }

servo-tidy.toml

@@ -30,11 +30,10 @@ packages = [
   "arrayvec",
   "base64",
   "cocoa",
-  "dwrote",
   "gleam",
+  "libloading",
   "peek-poke",
   "peek-poke-derive",
-  "libloading",
   "wayland-sys",
 
   # https://github.com/servo/servo/pull/23288#issuecomment-494687746