fixup! [NFY] Wrap semver::Version as Lua type

sile-typesetter · Oct 11, 2024 · 607fe4c · 607fe4c
1 parent 73f9cb9
commit 607fe4c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/rusile/src/lib.rs b/rusile/src/lib.rs
@@ -6,9 +6,10 @@ use mlua::prelude::*;
 
 #[mlua::lua_module]
 fn rusile(lua: &Lua) -> LuaResult<LuaTable> {
-    let exports = lua.create_table().unwrap();
+    let exports = lua.create_table()?;
     exports.set("demo", LuaFunction::wrap_raw(sile::rusile_demo))?;
     let x = sile::types::semver::Semver::new("3.2.1-rc0+foo")?;
     exports.set("x", x)?;
+    //exports.set("semver", LuaFunction::wrap_raw(sile::types::semver::semver))?;
     Ok(exports)
 }
diff --git a/src/types/semver.rs b/src/types/semver.rs
@@ -4,13 +4,13 @@ use std::ops::Deref;
 
 #[derive(Debug)]
 pub struct Semver {
-    pub version: Option<Version>,
+    pub version: Version,
 }
 
 impl Semver {
     pub fn new(version: &str) -> crate::Result<Self> {
         Ok(Self {
-            version: Some(Version::parse(version)?),
+            version: Version::parse(version)?,
         })
     }
 }
@@ -20,8 +20,8 @@ pub fn semver(version: &str) -> crate::Result<Semver> {
 }
 
 impl Deref for Semver {
-    type Target = Option<Version>;
-    fn deref(&self) -> &Option<Version> {
+    type Target = Version;
+    fn deref(&self) -> &Version {
         &self.version
     }
 }
@@ -33,12 +33,19 @@ impl IntoLua for Semver {
         let mt = lua.create_table()?;
         let ts = lua.create_function(|_, luaself: LuaTable| {
             dbg!(luaself);
-            Ok("apply of")
+            Ok("stahoeu")
+            //Ok(format!(
+            //    "{}.{}.{}",
+            //    luaself.get("major")?,
+            //    luaself.get("minor")?,
+            //    luaself.get("patch")?
+            //))
         })?;
         mt.set("__tostring", ts)?;
         semver.set_metatable(Some(mt));
-        let dodad = lua.create_string("abra kad").unwrap();
-        semver.set("dodad", dodad).unwrap();
+        semver.set("major", self.version.major)?;
+        semver.set("minor", self.version.minor)?;
+        semver.set("patch", self.version.patch)?;
         Ok(LuaValue::Table(semver))
     }
 }