diff options
Diffstat (limited to 'systems/workspace')
| -rw-r--r-- | systems/workspace/src/workspace.rs | 2 | ||||
| -rw-r--r-- | systems/workspace/src/workspace/config.rs | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/systems/workspace/src/workspace.rs b/systems/workspace/src/workspace.rs index 6310146..a34a000 100644 --- a/systems/workspace/src/workspace.rs +++ b/systems/workspace/src/workspace.rs @@ -1,6 +1,6 @@ use asset_system::rw::RWData; use constants::workspace::{dirs::workspace_dir_workspace, files::workspace_file_config}; -use framework::{SpaceRootTest, space::SpaceRoot}; +use framework::{space::SpaceRoot, space_macro::SpaceRootTest}; use tokio::fs::create_dir_all; use crate::workspace::config::WorkspaceConfig; diff --git a/systems/workspace/src/workspace/config.rs b/systems/workspace/src/workspace/config.rs index 278ec08..f43dc0e 100644 --- a/systems/workspace/src/workspace/config.rs +++ b/systems/workspace/src/workspace/config.rs @@ -85,9 +85,7 @@ impl WorkspaceConfig { } impl RWData<WorkspaceConfig> for WorkspaceConfig { - type DataType = WorkspaceConfig; - - async fn read(path: &PathBuf) -> Result<Self::DataType, DataReadError> { + async fn read(path: &PathBuf) -> Result<WorkspaceConfig, DataReadError> { let read_config = read_config(path).await; match read_config { Ok(config) => Ok(config), @@ -98,7 +96,7 @@ impl RWData<WorkspaceConfig> for WorkspaceConfig { } } - async fn write(data: Self::DataType, path: &PathBuf) -> Result<(), DataWriteError> { + async fn write(data: WorkspaceConfig, path: &PathBuf) -> Result<(), DataWriteError> { let write_config = write_config(path, &data).await; match write_config { Ok(_) => Ok(()), @@ -111,11 +109,11 @@ impl RWData<WorkspaceConfig> for WorkspaceConfig { } } - fn test_data() -> Self::DataType { + fn test_data() -> WorkspaceConfig { WorkspaceConfig::default() } - fn verify_data(data_a: Self::DataType, data_b: Self::DataType) -> bool { + fn verify_data(data_a: WorkspaceConfig, data_b: WorkspaceConfig) -> bool { &data_a == &data_b } } |
