Merge pull request #61 from tgolsson/ts/filestorage-from-path

actually take path for `FileStorage::from_path`

demo_glium/src/main.rs

@@ -6,7 +6,7 @@ fn main() {
     let title = "Egui glium demo";
 
     // Persist app state to file:
-    let storage = egui_glium::storage::FileStorage::from_path(".egui_demo_glium.json".into());
+    let storage = egui_glium::storage::FileStorage::from_path(".egui_demo_glium.json");
 
     // Alternative: store nowhere
     // let storage = egui::app::DummyStorage::default();

egui_glium/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+### Changed
+
+* FileStorage::from_path now takes `Into<Path>` instead of `String`
+
 ## 0.4.0 - 2020-11-28
 
 Started changelog. Features:

egui_glium/src/storage.rs

@@ -1,17 +1,21 @@
-use std::collections::HashMap;
+use std::{
+    collections::HashMap,
+    path::{Path, PathBuf},
+};
 
 // ----------------------------------------------------------------------------
 
 /// A key-value store backed by a JSON file on disk.
 /// Used to restore egui state, glium window position/size and app state.
 pub struct FileStorage {
-    path: String,
+    path: PathBuf,
     kv: HashMap<String, String>,
     dirty: bool,
 }
 
 impl FileStorage {
-    pub fn from_path(path: String) -> Self {
+    pub fn from_path(path: impl Into<PathBuf>) -> Self {
+        let path: PathBuf = path.into();
         Self {
             kv: read_json(&path).unwrap_or_default(),
             path,
@@ -42,7 +46,7 @@ impl egui::app::Storage for FileStorage {
 
 // ----------------------------------------------------------------------------
 
-pub fn read_json<T>(memory_json_path: impl AsRef<std::path::Path>) -> Option<T>
+pub fn read_json<T>(memory_json_path: impl AsRef<Path>) -> Option<T>
 where
     T: serde::de::DeserializeOwned,
 {

example_glium/.gitignore

@@ -0,0 +1 @@
+.egui_example_glium.json

example_glium/src/main.rs

@@ -10,7 +10,7 @@ fn main() {
     let title = "My Egui Window";
 
     // Persist app state to file:
-    let storage = egui_glium::storage::FileStorage::from_path(".egui_example_glium.json".into());
+    let storage = egui_glium::storage::FileStorage::from_path(".egui_example_glium.json");
 
     // Alternative: store nowhere
     // let storage = egui::app::DummyStorage::default();