me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into beacon

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-04-05 18:20:31 +02:00
commit 3f67044977
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
62 changed files with 713 additions and 780 deletions
Download patch file Download diff file Expand all files Collapse all files

27
examples/todos/src/main.rs
View file

@ -483,7 +483,6 @@ enum LoadError {
#[derive(Debug, Clone)]
enum SaveError {
File,
Write,
Format,
}
@ -505,15 +504,7 @@ impl SavedState {
}
async fn load() -> Result<SavedState, LoadError> {
use async_std::prelude::*;
let mut contents = String::new();
let mut file = async_std::fs::File::open(Self::path())
.await
.map_err(|_| LoadError::File)?;
file.read_to_string(&mut contents)
let contents = tokio::fs::read_to_string(Self::path())
.await
.map_err(|_| LoadError::File)?;
@ -521,31 +512,25 @@ impl SavedState {
}
async fn save(self) -> Result<(), SaveError> {
use async_std::prelude::*;
let json = serde_json::to_string_pretty(&self)
.map_err(|_| SaveError::Format)?;
let path = Self::path();
if let Some(dir) = path.parent() {
async_std::fs::create_dir_all(dir)
tokio::fs::create_dir_all(dir)
.await
.map_err(|_| SaveError::File)?;
.map_err(|_| SaveError::Write)?;
}
{
let mut file = async_std::fs::File::create(path)
.await
.map_err(|_| SaveError::File)?;
file.write_all(json.as_bytes())
tokio::fs::write(path, json.as_bytes())
.await
.map_err(|_| SaveError::Write)?;
}
// This is a simple way to save at most once every couple seconds
async_std::task::sleep(std::time::Duration::from_secs(2)).await;
tokio::time::sleep(std::time::Duration::from_secs(2)).await;
Ok(())
}
@ -571,7 +556,7 @@ impl SavedState {
}
async fn save(self) -> Result<(), SaveError> {
let storage = Self::storage().ok_or(SaveError::File)?;
let storage = Self::storage().ok_or(SaveError::Write)?;
let json = serde_json::to_string_pretty(&self)
.map_err(|_| SaveError::Format)?;