summaryrefslogtreecommitdiffstats
path: root/src/sandbox.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 /src/sandbox.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 'src/sandbox.rs')
-rw-r--r--src/sandbox.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sandbox.rs b/src/sandbox.rs
index 6a73eab0..c72b58d8 100644
--- a/src/sandbox.rs
+++ b/src/sandbox.rs
@@ -1,5 +1,6 @@
+use crate::executor;
use crate::{
- executor, Application, Color, Command, Element, Settings, Subscription,
+ Application, Color, Command, Element, Error, Settings, Subscription,
};
/// A sandboxed [`Application`].
@@ -64,7 +65,7 @@ use crate::{
/// ```no_run
/// use iced::{Element, Sandbox, Settings, Text};
///
-/// pub fn main() {
+/// pub fn main() -> iced::Result {
/// Hello::run(Settings::default())
/// }
///
@@ -159,7 +160,7 @@ pub trait Sandbox {
/// It should probably be that last thing you call in your `main` function.
///
/// [`Sandbox`]: trait.Sandbox.html
- fn run(settings: Settings<()>)
+ fn run(settings: Settings<()>) -> Result<(), Error>
where
Self: 'static + Sized,
{