diff --git a/server-default.toml b/server-default.toml index 847118d..7744392 100644 --- a/server-default.toml +++ b/server-default.toml @@ -1,5 +1,5 @@ [forge.default] -type = "forgejo" +forge_type = "forgejo" url = "https://git.example.net" user = "git-next" # the user to perform actions as # API token for user? diff --git a/src/server/config.rs b/src/server/config.rs index 5fb6c90..cd6d8f5 100644 --- a/src/server/config.rs +++ b/src/server/config.rs @@ -5,7 +5,7 @@ use crate::filesystem::FileSystem; #[derive(Debug, PartialEq, Eq, Deserialize)] pub struct Config { - r#type: ForgeType, + forge_type: ForgeType, url: String, user: String, // API Token @@ -26,8 +26,8 @@ impl Config { let str = fs.read_file("git-next-server.toml").map_err(OneOf::new)?; toml::from_str(&str).map_err(OneOf::new) } - pub const fn r#type(&self) -> &ForgeType { - &self.r#type + pub const fn forge_type(&self) -> &ForgeType { + &self.forge_type } pub fn url(&self) -> &str { self.url.as_str() @@ -49,14 +49,14 @@ mod tests { fs.write_file( "git-next-server.toml", r#" - type = "ForgeJo" + forge_type = "ForgeJo" url = "https://forge.jo" user = "Bob" "#, ) .map_err(OneOf::new)?; let config = Config::load(&fs)?; - assert_eq!(config.r#type(), &ForgeType::ForgeJo); + assert_eq!(config.forge_type(), &ForgeType::ForgeJo); assert_eq!(config.url(), "https://forge.jo".to_string()); assert_eq!(config.user(), "Bob".to_string());