Move `Canvas` and `QRCode` to `iced` crate

Rename `canvas` modules to `geometry` in graphics subcrates

4 files changed, 7 insertions, 9 deletions

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 0bcef71c..2e39a9e7 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -21,7 +21,7 @@ bmp = ["iced_graphics/bmp"]
 hdr = ["iced_graphics/hdr"]
 dds = ["iced_graphics/dds"]
 farbfeld = ["iced_graphics/farbfeld"]
-canvas = ["iced_graphics/canvas", "lyon"]
+geometry = ["iced_graphics/geometry", "lyon"]
 spirv = ["wgpu/spirv"]
 webgl = ["wgpu/webgl"]
 
diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 10dc5b4f..6f39a5fe 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -329,8 +329,6 @@ impl Backend {
 }
 
 impl iced_graphics::Backend for Backend {
-    type Geometry = ();
-
     fn trim_measurements(&mut self) {
         self.text_pipeline.trim_measurement_cache()
     }
diff --git a/wgpu/src/canvas.rs b/wgpu/src/geometry.rs
index e8d540c3..11e8126f 100644
--- a/wgpu/src/canvas.rs
+++ b/wgpu/src/geometry.rs
@@ -1,9 +1,9 @@
-use iced_graphics::primitive::{self, Primitive};
-use iced_native::widget::canvas::fill::{self, Fill};
-use iced_native::widget::canvas::{
+use iced_graphics::geometry::fill::{self, Fill};
+use iced_graphics::geometry::{
     LineCap, LineDash, LineJoin, Path, Stroke, Style, Text,
 };
-use iced_native::{Gradient, Point, Rectangle, Size, Vector};
+use iced_graphics::primitive::{self, Primitive};
+use iced_graphics::{Gradient, Point, Rectangle, Size, Vector};
 
 use lyon::geom::euclid;
 use lyon::tessellation;
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 31db16a8..4439b185 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -41,8 +41,8 @@ pub mod layer;
 pub mod settings;
 pub mod window;
 
-#[cfg(feature = "canvas")]
-pub mod canvas;
+#[cfg(feature = "geometry")]
+pub mod geometry;
 
 mod backend;
 mod buffer;