Skip to content

Commit 9e117c5

Browse files
committed
Switch to the Rust 2024 Edition
1 parent 8cb307d commit 9e117c5

File tree

5 files changed

+9
-22
lines changed

5 files changed

+9
-22
lines changed

rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "euler"
33
version = "0.1.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
regex = "1.11.1"

rust/src/bin/p0024.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ fn compute(mut idx: usize) -> String {
2525
}
2626

2727
fn factorial(n: usize) -> usize {
28-
if n > 1 {
29-
n * factorial(n - 1)
30-
} else {
31-
1
32-
}
28+
if n > 1 { n * factorial(n - 1) } else { 1 }
3329
}
3430

3531
#[cfg(test)]

rust/src/bin/p0050.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn compute(limit: i64) -> i64 {
2222
.enumerate()
2323
.skip(1)
2424
.rev()
25-
.find(|(_, &p)| p - base < limit && primes::is_prime(p - base))
25+
.find(|&(_, &p)| p - base < limit && primes::is_prime(p - base))
2626
{
2727
k += tpl.0;
2828
ans = tpl.1 - base;

rust/src/bin/p0092.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,7 @@ fn compute(limit: i64) -> usize {
9393
}
9494

9595
fn factorial(n: usize) -> usize {
96-
if n > 1 {
97-
n * factorial(n - 1)
98-
} else {
99-
1
100-
}
96+
if n > 1 { n * factorial(n - 1) } else { 1 }
10197
}
10298

10399
fn is_group89(mut n: i32) -> bool {

rust/src/math.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ pub fn lcm(mut x: i64, mut y: i64) -> i64 {
4343

4444
pub fn bit_length(n: i64) -> u32 {
4545
fn aux(n: i64, cnt: u32) -> u32 {
46-
if n == 0 {
47-
cnt
48-
} else {
49-
aux(n / 2, cnt + 1)
50-
}
46+
if n == 0 { cnt } else { aux(n / 2, cnt + 1) }
5147
}
5248

5349
aux(n, 0)
@@ -69,14 +65,13 @@ pub fn isqrt(n: i64) -> i64 {
6965
0
7066
} else {
7167
let a = aux((bit_length(n) - 1) / 2, n);
72-
if n < a * a {
73-
a - 1
74-
} else {
75-
a
76-
}
68+
if n < a * a { a - 1 } else { a }
7769
}
7870
}
7971

72+
/// # Panics
73+
///
74+
/// Will panic if n is less than 2
8075
pub fn prime_factors(mut n: i64) -> Vec<i64> {
8176
assert!(n > 1);
8277

0 commit comments

Comments
 (0)