diff options
author | 2020-04-06 20:12:16 +0200 | |
---|---|---|
committer | 2020-04-06 20:12:16 +0200 | |
commit | 3c47e3e2295e2dd6ca60e50111b9b89a4bb025fe (patch) | |
tree | 827820e6b2ac3e19ebbb80cb987a37175f937c3e /examples/tour | |
parent | 1a9bfd9e737c4203c9ec607465c106da08ad5020 (diff) | |
download | iced-3c47e3e2295e2dd6ca60e50111b9b89a4bb025fe.tar.gz iced-3c47e3e2295e2dd6ca60e50111b9b89a4bb025fe.tar.bz2 iced-3c47e3e2295e2dd6ca60e50111b9b89a4bb025fe.zip |
Simplify `Language` conversion in `tour`
Diffstat (limited to 'examples/tour')
-rw-r--r-- | examples/tour/src/main.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs index 0928cf30..c9678b9d 100644 --- a/examples/tour/src/main.rs +++ b/examples/tour/src/main.rs @@ -528,10 +528,9 @@ impl<'a> Step { .push(Language::all().iter().cloned().fold( Column::new().padding(10).spacing(20), |choices, language| { - let label: &str = language.into(); choices.push(Radio::new( language, - label, + language, selection, StepMessage::LanguageSelected, )) @@ -730,16 +729,16 @@ impl Language { } } -impl From<Language> for &str { - fn from(language: Language) -> &'static str { - match language { +impl From<Language> for String { + fn from(language: Language) -> String { + String::from(match language { Language::Rust => "Rust", Language::Elm => "Elm", Language::Ruby => "Ruby", Language::Haskell => "Haskell", Language::C => "C", Language::Other => "Other", - } + }) } } |