summaryrefslogtreecommitdiffstats
path: root/wgpu/src/lib.rs
diff options
context:
space:
mode:
authorLibravatar Kaiden42 <gitlab@tinysn.com>2020-09-09 14:47:36 +0200
committerLibravatar Kaiden42 <gitlab@tinysn.com>2020-09-09 14:47:36 +0200
commit0724fb8ebf7c60b396843d021b949cc9061b4c3e (patch)
treee538d3b83d399acccf62577f4eebc459d44b5ef8 /wgpu/src/lib.rs
parent5bfa4805a944abe82700287f0af0117462d6d21c (diff)
parent49076c6ac2983e2076dae64f68a2e801904d7ce9 (diff)
downloadiced-0724fb8ebf7c60b396843d021b949cc9061b4c3e.tar.gz
iced-0724fb8ebf7c60b396843d021b949cc9061b4c3e.tar.bz2
iced-0724fb8ebf7c60b396843d021b949cc9061b4c3e.zip
Merge branch 'master' from upstream into embedded
Diffstat (limited to 'wgpu/src/lib.rs')
-rw-r--r--wgpu/src/lib.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 570e8a94..5f44dd91 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -36,7 +36,9 @@ mod backend;
mod quad;
mod text;
-pub use iced_graphics::{Antialiasing, Color, Defaults, Primitive, Viewport};
+pub use iced_graphics::{
+ Antialiasing, Color, Defaults, Error, Primitive, Viewport,
+};
pub use wgpu;
pub use backend::Backend;