Skip to content

fixed typo in fifty and fifteen #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tolik518 merged 3 commits into from
Mar 28, 2026
Merged

fixed typo in fifty and fifteen #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfc9659
fixed typo in fifty and fifteen
tolik518 Mar 28, 2026
1ec6c2f
bumped version and updated some dependencies
tolik518 Mar 28, 2026
06ed1cf
bumped version of lib
tolik518 Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions factorion-bot-discord/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"] }
Expand Down
6 changes: 3 additions & 3 deletions factorion-bot-reddit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 }
Expand Down
6 changes: 3 additions & 3 deletions factorion-lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions factorion-lib/src/format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] = [
Expand All @@ -147,7 +147,7 @@ const EN_TENS_SINGLES: [&str; 10] = [
"twelve ",
"thirteen ",
"fourteen ",
"fiveteen ",
"fifteen ",
"sixteen ",
"seventeen ",
"eighteen ",
Expand Down Expand Up @@ -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"
);
}

Expand Down
2 changes: 1 addition & 1 deletion factorion-lib/tests/integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))*"
);
}

Expand Down
4 changes: 2 additions & 2 deletions factorion-math/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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]
Expand Down
Loading