Merge branch 'master' into improvement/update-wgpu_glyph

wgpu/Cargo.toml

@@ -9,16 +9,16 @@ repository = "https://github.com/hecrj/iced"
 
 [features]
 svg = ["resvg"]
-canvas = ["lyon"]
+canvas = ["iced_graphics/canvas"]
 
 [dependencies]
 wgpu = "0.5"
 wgpu_glyph = "0.9"
-zerocopy = "0.3"
 glyph_brush = "0.7"
+zerocopy = "0.3"
+bytemuck = "1.2"
 raw-window-handle = "0.3"
 glam = "0.8"
-font-kit = "0.6"
 log = "0.4"
 guillotiere = "0.5"
 # Pin `gfx-memory` until https://github.com/gfx-rs/wgpu-rs/issues/261 is
@@ -29,9 +29,10 @@ gfx-memory = "=0.1.1"
 version = "0.2"
 path = "../native"
 
-[dependencies.iced_style]
+[dependencies.iced_graphics]
 version = "0.1"
-path = "../style"
+path = "../graphics"
+features = ["font-source", "font-fallback", "font-icons"]
 
 [dependencies.image]
 version = "0.23"
@@ -42,10 +43,6 @@ version = "0.9"
 features = ["raqote-backend"]
 optional = true
 
-[dependencies.lyon]
-version = "0.15"
-optional = true
-
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]
 all-features = true