summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/error.rs6
-rw-r--r--src/main.rs10
-rw-r--r--src/types/project.rs36
3 files changed, 29 insertions, 23 deletions
diff --git a/src/error.rs b/src/error.rs
index f4011bd..09e6e86 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -53,3 +53,9 @@ impl From<String> for Error {
Self::Other(value)
}
}
+
+impl From<Error> for String {
+ fn from(value: Error) -> Self {
+ value.to_string()
+ }
+}
diff --git a/src/main.rs b/src/main.rs
index 6301682..5f25a28 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -164,7 +164,7 @@ impl App {
self.editor_content =
text_editor::Content::with_text(&code);
}
- Err(error) => error_dialog(error.to_string()),
+ Err(error) => error_dialog(error),
}
}
Message::DropNewElement(name, point, _) => {
@@ -188,7 +188,7 @@ impl App {
Ok(Some(ref element)) => {
self.project.element_tree = Some(element.clone());
}
- Err(error) => error_dialog(error.to_string()),
+ Err(error) => error_dialog(error),
_ => {}
}
@@ -218,7 +218,7 @@ impl App {
action,
);
if let Err(error) = result {
- error_dialog(error.to_string());
+ error_dialog(error);
}
self.is_dirty = true;
@@ -278,7 +278,7 @@ impl App {
self.project_path = Some(path);
return Task::done(Message::RefreshEditorContent);
}
- Err(error) => error_dialog(error.to_string()),
+ Err(error) => error_dialog(error),
}
}
Message::SaveFile => {
@@ -311,7 +311,7 @@ impl App {
self.project_path = Some(path);
self.is_dirty = false;
}
- Err(error) => error_dialog(error.to_string()),
+ Err(error) => error_dialog(error),
}
}
}
diff --git a/src/types/project.rs b/src/types/project.rs
index 27c576b..18247ae 100644
--- a/src/types/project.rs
+++ b/src/types/project.rs
@@ -122,30 +122,30 @@ impl Project {
let app_code = format!(
r#"// Automatically generated by iced Builder
- use iced::{{widget::{{{imports}}},Element}};
- {theme_imports}
+use iced::{{widget::{{{imports}}},Element}};
+{theme_imports}
- fn main() -> iced::Result {{
- iced::application("{}", State::update, State::view).theme(State::theme).run()
- }}
+fn main() -> iced::Result {{
+ iced::application("{}", State::update, State::view).theme(State::theme).run()
+}}
- #[derive(Default)]
- struct State;
+#[derive(Default)]
+struct State;
- #[derive(Debug, Clone)]
- enum Message {{}}
+#[derive(Debug, Clone)]
+enum Message {{}}
- impl State {{
- fn update(&mut self, _message: Message) {{}}
+impl State {{
+ fn update(&mut self, _message: Message) {{}}
- fn theme(&self) -> iced::Theme {{
- iced::Theme::{}
- }}
+ fn theme(&self) -> iced::Theme {{
+ iced::Theme::{}
+ }}
- fn view(&self) -> Element<Message> {{
- {view}.into()
- }}
- }}"#,
+ fn view(&self) -> Element<Message> {{
+ {view}.into()
+ }}
+}}"#,
match self.title {
Some(ref t) => t,
None => "New app",