summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-03-17 20:17:23 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-03-17 20:17:23 +0100
commitd1dc62ebcdab6ec57605d276a02d6dae1e97c30d (patch)
tree66ab2733d426b887731ba32b32c03a0f1ba43451 /examples
parentea50ec8df1431c9c6aa8077cd1578c4698dc0314 (diff)
parentd7fffaa801423ae989fa7693f5b1cb424194e1ff (diff)
downloadiced-d1dc62ebcdab6ec57605d276a02d6dae1e97c30d.tar.gz
iced-d1dc62ebcdab6ec57605d276a02d6dae1e97c30d.tar.bz2
iced-d1dc62ebcdab6ec57605d276a02d6dae1e97c30d.zip
Merge branch 'master' into advanced-text
Diffstat (limited to 'examples')
-rw-r--r--examples/checkbox/README.md2
-rw-r--r--examples/pick_list/src/main.rs9
-rw-r--r--examples/todos/src/main.rs11
3 files changed, 7 insertions, 15 deletions
diff --git a/examples/checkbox/README.md b/examples/checkbox/README.md
index b7f85684..76e6764c 100644
--- a/examples/checkbox/README.md
+++ b/examples/checkbox/README.md
@@ -6,7 +6,7 @@ The __[`main`]__ file contains all the code of the example.
You can run it with `cargo run`:
```
-cargo run --package pick_list
+cargo run --package checkbox
```
[`main`]: src/main.rs
diff --git a/examples/pick_list/src/main.rs b/examples/pick_list/src/main.rs
index 62a4ef88..21200621 100644
--- a/examples/pick_list/src/main.rs
+++ b/examples/pick_list/src/main.rs
@@ -61,8 +61,9 @@ impl Sandbox for Example {
}
}
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
pub enum Language {
+ #[default]
Rust,
Elm,
Ruby,
@@ -84,12 +85,6 @@ impl Language {
];
}
-impl Default for Language {
- fn default() -> Language {
- Language::Rust
- }
-}
-
impl std::fmt::Display for Language {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(
diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index 1cc18eca..48b4f2f8 100644
--- a/examples/todos/src/main.rs
+++ b/examples/todos/src/main.rs
@@ -440,19 +440,16 @@ fn view_controls(tasks: &[Task], current_filter: Filter) -> Element<Message> {
.into()
}
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(
+ Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize,
+)]
pub enum Filter {
+ #[default]
All,
Active,
Completed,
}
-impl Default for Filter {
- fn default() -> Self {
- Filter::All
- }
-}
-
impl Filter {
fn matches(&self, task: &Task) -> bool {
match self {