Skip to content

Commit 9ec2e8a

Browse files
committed
cargo fmt
1 parent 9fc1c63 commit 9ec2e8a

3 files changed

Lines changed: 11 additions & 10 deletions

File tree

factorion-bot-reddit/src/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ fn en_str() -> &'static str {
4646
"en"
4747
}
4848

49-
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
50-
#[derive(Default)]
49+
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Default)]
5150
enum SubredditMode {
5251
All,
5352
PostOnly,

factorion-lib/src/calculation_tasks.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,8 @@ impl CalculationJob {
296296
math::approximate_multifactorial(calc_num.clone(), level as u32, prec)
297297
};
298298
CalculationResult::Approximate(
299-
((factorial.0 * if !negative.is_multiple_of(2) { -1 } else { 1 }) as Float).into(),
299+
((factorial.0 * if !negative.is_multiple_of(2) { -1 } else { 1 }) as Float)
300+
.into(),
300301
factorial.1,
301302
)
302303
} else {
@@ -316,7 +317,8 @@ impl CalculationJob {
316317
} else if calc_num > consts.upper_subfactorial_limit {
317318
let factorial = math::approximate_subfactorial(calc_num.clone(), prec);
318319
CalculationResult::Approximate(
319-
((factorial.0 * if !negative.is_multiple_of(2) { -1 } else { 1 }) as Float).into(),
320+
((factorial.0 * if !negative.is_multiple_of(2) { -1 } else { 1 }) as Float)
321+
.into(),
320322
factorial.1,
321323
)
322324
} else {
@@ -335,7 +337,8 @@ impl CalculationJob {
335337
} else if calc_num > consts.upper_termial_limit {
336338
let termial = math::approximate_termial(calc_num, -level as u32, prec);
337339
CalculationResult::Approximate(
338-
((termial.0 * if !negative.is_multiple_of(2) { -1 } else { 1 }) as Float).into(),
340+
((termial.0 * if !negative.is_multiple_of(2) { -1 } else { 1 }) as Float)
341+
.into(),
339342
termial.1,
340343
)
341344
} else {

factorion-lib/src/format.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -366,11 +366,10 @@ pub fn format_float(acc: &mut String, number: &Float, consts: &Consts) -> std::f
366366
decimal_part.remove(0);
367367
decimal_part.remove(0);
368368
decimal_part.truncate(consts.number_decimals_scientific + 1);
369-
if decimal_part.len() > consts.number_decimals_scientific
370-
&& round(&mut decimal_part) {
371-
decimal_part.clear();
372-
whole_number += 1;
373-
}
369+
if decimal_part.len() > consts.number_decimals_scientific && round(&mut decimal_part) {
370+
decimal_part.clear();
371+
whole_number += 1;
372+
}
374373
if let Some(mut digit) = decimal_part.pop() {
375374
while digit == '0' {
376375
digit = match decimal_part.pop() {

0 commit comments

Comments
 (0)