summaryrefslogtreecommitdiffstats
path: root/examples/pokedex/src/main.rs
diff options
context:
space:
mode:
Diffstat (limited to 'examples/pokedex/src/main.rs')
-rw-r--r--examples/pokedex/src/main.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/pokedex/src/main.rs b/examples/pokedex/src/main.rs
index 283437b2..3c00d628 100644
--- a/examples/pokedex/src/main.rs
+++ b/examples/pokedex/src/main.rs
@@ -27,7 +27,7 @@ enum Message {
}
impl Application for Pokedex {
- type Executor = iced_futures::executor::AsyncStd;
+ type Executor = iced_futures::executor::Tokio;
type Message = Message;
fn new() -> (Pokedex, Command<Message>) {
@@ -175,8 +175,8 @@ impl Pokemon {
let sprite = format!("https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/{}.png", id);
let (entry, sprite): (Entry, _) = futures::future::try_join(
- surf::get(&url).recv_json(),
- surf::get(&sprite).recv_bytes(),
+ reqwest::get(&url).await?.json(),
+ reqwest::get(&sprite).await?.bytes(),
)
.await?;
@@ -195,7 +195,7 @@ impl Pokemon {
.chars()
.map(|c| if c.is_control() { ' ' } else { c })
.collect(),
- image: image::Handle::from_memory(sprite),
+ image: image::Handle::from_memory(sprite.as_ref().to_vec()),
})
}
}
@@ -206,9 +206,9 @@ enum Error {
LanguageError,
}
-impl From<surf::Exception> for Error {
- fn from(exception: surf::Exception) -> Error {
- dbg!(&exception);
+impl From<reqwest::Error> for Error {
+ fn from(error: reqwest::Error) -> Error {
+ dbg!(&error);
Error::APIError
}