Merge pull request #338 from tolik518/fifty

tolik518 · web-flow · commit 1da6cf4511c8 · 2026-03-28T23:05:11.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/factorion-bot-discord/Cargo.toml b/factorion-bot-discord/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factorion-bot-discord"
-version = "3.0.1"
+version = "3.0.2"
 edition = "2024"
 description = "factorion-bot (for factorials and related) on Discord"
 license = "MIT"
@@ -10,11 +10,11 @@ keywords = ["factorial", "termial", "bot", "math", "discord"]
 categories = ["mathematics", "web-programming", "parser-implementations"]
 
 [dependencies]
-factorion-lib = { path = "../factorion-lib", version = "6.0.1", features = ["serde", "influxdb"] }
+factorion-lib = { path = "../factorion-lib", version = "6.0.2", features = ["serde", "influxdb"] }
 serenity = { version = "0.12", default-features = false, features = ["client", "gateway", "rustls_backend", "model", "cache"] }
 tokio = { version = "1.48.0", features = ["macros", "rt-multi-thread", "time"] }
 dotenvy = "^0.15.7"
-log = "0.4.28"
+log = "0.4.29"
 env_logger = "0.11.8"
 anyhow = { version = "1.0.100", default-features = false, features = ["std"] }
 serde = { version = "1.0", features = ["derive"] }
diff --git a/factorion-bot-reddit/Cargo.toml b/factorion-bot-reddit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factorion-bot-reddit"
-version = "6.0.1"
+version = "6.0.2"
 edition = "2024"
 description = "factorion-bot (for factorials and related) on Reddit"
 license = "MIT"
@@ -10,10 +10,10 @@ keywords = ["factorial", "termial", "bot", "math"]
 categories = ["mathematics", "web-programming", "parser-implementations"]
 
 [dependencies]
-factorion-lib = {path = "../factorion-lib", version = "6.0.1", features = ["serde", "influxdb"]}
+factorion-lib = {path = "../factorion-lib", version = "6.0.2", features = ["serde", "influxdb"]}
 reqwest = { version = "0.12.28", features = ["json", "native-tls"], default-features = false }
 serde = { version = "1.0.219", default-features = false, features = ["derive"] }
-serde_json = "1.0.140"
+serde_json = "1.0.145"
 postcard = {version = "1.1.3", features = ["use-std"]}
 tokio = { version = "1.48.0", features = ["macros", "rt-multi-thread"] }
 base64 = { version = "0.22.1", default-features = false }
diff --git a/factorion-lib/Cargo.toml b/factorion-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factorion-lib"
-version = "6.0.1"
+version = "6.0.2"
 edition = "2024"
 description = "A library used to create bots to recognize and calculate factorials and related concepts"
 license = "MIT"
@@ -10,12 +10,12 @@ keywords = ["factorial", "termial", "bot", "math"]
 categories = ["mathematics", "web-programming", "parser-implementations"]
 
 [dependencies]
-factorion-math = {path = "../factorion-math", version = "1.0.3"}
+factorion-math = {path = "../factorion-math", version = "1.0.5"}
 serde = {version = "1.0", features = ["derive"], optional = true}
 serde_json = {version = "1.0", optional = true}
 concat-idents = "1.1.4"
 influxdb = {version = "0.7.2", features = ["derive", "reqwest"], default-features = true, optional = true}
-chrono = {version = "0.4.41", features = ["now"], default-features = false, optional = true}
+chrono = {version = "0.4.42", features = ["now"], default-features = false, optional = true}
 
 [dev-dependencies]
 arbtest = "0.3.2"
diff --git a/factorion-lib/src/format.rs b/factorion-lib/src/format.rs
@@ -138,7 +138,7 @@ const EN_SINGLES: [&str; 10] = [
     "", "one ", "two ", "three ", "four ", "five ", "six ", "seven ", "eight ", "nine ",
 ];
 const EN_TENS: [&str; 10] = [
-    "", "ten ", "twenty ", "thirty ", "forty ", "fivety ", "sixty ", "seventy ", "eighty ",
+    "", "ten ", "twenty ", "thirty ", "forty ", "fifty ", "sixty ", "seventy ", "eighty ",
     "ninety ",
 ];
 const EN_TENS_SINGLES: [&str; 10] = [
@@ -147,7 +147,7 @@ const EN_TENS_SINGLES: [&str; 10] = [
     "twelve ",
     "thirteen ",
     "fourteen ",
-    "fiveteen ",
+    "fifteen ",
     "sixteen ",
     "seventeen ",
     "eighteen ",
@@ -513,13 +513,13 @@ mod tests {
         .unwrap();
         assert_eq!(
             acc,
-            "one tredeccentillion two hundred thirty four duodeccentillion five hundred sixty seven undeccentillion eight hundred ninety deccentillion one hundred twenty three novemcentillion four hundred fivety six octocentillion"
+            "one tredeccentillion two hundred thirty four duodeccentillion five hundred sixty seven undeccentillion eight hundred ninety deccentillion one hundred twenty three novemcentillion four hundred fifty six octocentillion"
         );
         let mut acc = String::new();
         write_out_number(&mut acc, &"123456789".parse().unwrap(), &consts).unwrap();
         assert_eq!(
             acc,
-            "one hundred twenty three million four hundred fivety six thousand seven hundred eighty nine"
+            "one hundred twenty three million four hundred fifty six thousand seven hundred eighty nine"
         );
     }
 
diff --git a/factorion-lib/tests/integration.rs b/factorion-lib/tests/integration.rs
@@ -1825,7 +1825,7 @@ fn test_write_out_factorial_digits() {
     let reply = comment.get_reply(&consts);
     assert_eq!(
         reply,
-        "Factorial of sixty seven novemnonagintillion eight hundred thirty nine octononagintillion one hundred twenty seven septennonagintillion eight hundred thirty seven sexnonagintillion four hundred forty two quinnonagintillion eight hundred seventy three quattuornonagintillion has approximately twenty centillion four hundred forty six novemnonagintillion five hundred twenty two octononagintillion two hundred fiveteen septennonagintillion five hundred sixty four sexnonagintillion two hundred thirty six quinnonagintillion digits \n\n\n*^(This action was performed by a bot | [Source code](http://f.r0.fyi))*"
+        "Factorial of sixty seven novemnonagintillion eight hundred thirty nine octononagintillion one hundred twenty seven septennonagintillion eight hundred thirty seven sexnonagintillion four hundred forty two quinnonagintillion eight hundred seventy three quattuornonagintillion has approximately twenty centillion four hundred forty six novemnonagintillion five hundred twenty two octononagintillion two hundred fifteen septennonagintillion five hundred sixty four sexnonagintillion two hundred thirty six quinnonagintillion digits \n\n\n*^(This action was performed by a bot | [Source code](http://f.r0.fyi))*"
     );
 }
 
diff --git a/factorion-math/Cargo.toml b/factorion-math/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "factorion-math"
-version = "1.0.4"
+version = "1.0.5"
 edition = "2024"
 description = "The math (factorials and related functions) used by factorion"
 license = "MIT"
@@ -10,7 +10,7 @@ keywords = ["factorial", "termial", "math"]
 categories = ["mathematics"]
 
 [dependencies]
-rug = { version = "1.27.0", features = ["integer", "float"], default-features = false }
+rug = { version = "1.28.1", features = ["integer", "float"], default-features = false }
 gmp-mpfr-sys = "=1.6.4"
 
 [features]

Original file line number	Diff line number	Diff line change
`@@ -1825,7 +1825,7 @@ fn test_write_out_factorial_digits() {`
`1825`	`1825`	`let reply = comment.get_reply(&consts);`
`1826`	`1826`	`assert_eq!(`
`1827`	`1827`	`reply,`
`1828`		- "Factorial of sixty seven novemnonagintillion eight hundred thirty nine octononagintillion one hundred twenty seven septennonagintillion eight hundred thirty seven sexnonagintillion four hundred forty two quinnonagintillion eight hundred seventy three quattuornonagintillion has approximately twenty centillion four hundred forty six novemnonagintillion five hundred twenty two octononagintillion two hundred fiveteen septennonagintillion five hundred sixty four sexnonagintillion two hundred thirty six quinnonagintillion digits \n\n\n^(This action was performed by a bot \| [Source code](http://f.r0.fyi))"
	`1828`	+ "Factorial of sixty seven novemnonagintillion eight hundred thirty nine octononagintillion one hundred twenty seven septennonagintillion eight hundred thirty seven sexnonagintillion four hundred forty two quinnonagintillion eight hundred seventy three quattuornonagintillion has approximately twenty centillion four hundred forty six novemnonagintillion five hundred twenty two octononagintillion two hundred fifteen septennonagintillion five hundred sixty four sexnonagintillion two hundred thirty six quinnonagintillion digits \n\n\n^(This action was performed by a bot \| [Source code](http://f.r0.fyi))"
`1829`	`1829`	`);`
`1830`	`1830`	`}`
`1831`	`1831`