clean the code

Author: Its-Just-Nans

src/config/models/mod.rs

@@ -29,7 +29,7 @@ mod test;
 use anyhow::{bail, Context, Result};
 use schemars::JsonSchema;
 use serde::Deserialize;
-use source::{workspace, Source};
+use source::{workspace::WorkspaceConfig, Source};
 use std::path::{Path, PathBuf};
 use tracing::log;
 
@@ -120,7 +120,7 @@ pub async fn load_workspace_config(
 ) -> Result<Option<PathBuf>> {
     let cargo_toml = current_path.join("Cargo.toml");
     if cargo_toml.exists() {
-        if let Ok(workspace) = workspace::workspace_from_manifest(&cargo_toml).await {
+        if let Ok(workspace) = WorkspaceConfig::new(&cargo_toml).await {
             match workspace_name {
                 Some(name) => {
                     if let Some(workspace) = workspace.get_workspace_by_name(&name) {

src/config/models/source/workspace.rs

@@ -1,10 +1,11 @@
 use anyhow::{Context, Result};
 use cargo_metadata::{Metadata, MetadataCommand};
+use serde::{Deserialize, Serialize};
 use std::path::Path;
 use std::path::PathBuf;
 use tokio::task::spawn_blocking;
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct WorkspaceConfig {
     pub metadata: Metadata,
 }
@@ -21,12 +22,12 @@ impl WorkspaceConfig {
     }
 
     pub fn get_default_workspace(self) -> Option<PathBuf> {
-        if let Some(default_members) = self.metadata.workspace_default_members.first() {
+        if let Some(default_member) = self.metadata.workspace_default_members.first() {
             if let Some(found) = self
                 .metadata
                 .packages
                 .into_iter()
-                .find(|p| p.id == *default_members)
+                .find(|p| p.id == *default_member)
             {
                 return Some(found.manifest_path.clone().into());
             }
@@ -51,9 +52,3 @@ impl WorkspaceConfig {
         None
     }
 }
-
-/// Load the trunk configuration from the cargo manifest
-pub async fn workspace_from_manifest(file: impl AsRef<Path>) -> anyhow::Result<WorkspaceConfig> {
-    let workspace_config = WorkspaceConfig::new(file.as_ref()).await?;
-    Ok(workspace_config)
-}