Rust 2024

Author: printfn

Cargo.lock

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 version = "1.5.5"
 description = "Arbitrary-precision unit-aware calculator"
-edition = "2021"
+edition = "2024"
 homepage = "https://github.com/printfn/fend"
 repository = "https://github.com/printfn/fend"
 keywords = ["calculator", "cli", "conversion", "math", "tool"]

Cargo.toml

@@ -16,7 +16,7 @@ fend-core.workspace = true
 home = "0.5.11"
 rand = { version = "0.9.0", default-features = false, features = ["thread_rng"] }
 rustyline = { version =  "15.0.0", default-features = false, features = ["with-file-history", "custom-bindings"] }
-serde = { version = "1.0.217", default-features = false }
+serde = { version = "1.0.218", default-features = false }
 toml = { version = "0.8.20", default-features = false, features = ["parse"] }
 minreq = { version = "2.13.2", default-features = false, optional = true }
 

cli/Cargo.toml

@@ -43,7 +43,7 @@ impl serde::de::Visitor<'_> for ExchangeRateSourceVisitor {
 				return Err(serde::de::Error::unknown_variant(
 					v,
 					&["EU", "UN", "disabled"],
-				))
+				));
 			}
 		})
 	}
@@ -103,7 +103,9 @@ impl<'de> serde::de::Visitor<'de> for ConfigVisitor {
 					} else if enable_colors == "always".into() {
 						result.enable_colors = true;
 					} else {
-						eprintln!("Error: unknown config setting for `{key}`, expected one of `'never'`, `'auto'` or `'always'`");
+						eprintln!(
+							"Error: unknown config setting for `{key}`, expected one of `'never'`, `'auto'` or `'always'`"
+						);
 					}
 					seen_enable_colors = true;
 				}
@@ -151,7 +153,7 @@ impl<'de> serde::de::Visitor<'de> for ConfigVisitor {
 							return Err(serde::de::Error::invalid_value(
 								serde::de::Unexpected::Str(v),
 								&"`ignore` or `warn`",
-							))
+							));
 						}
 					};
 				}
@@ -174,7 +176,7 @@ impl<'de> serde::de::Visitor<'de> for ConfigVisitor {
 							return Err(serde::de::Error::invalid_value(
 								serde::de::Unexpected::Str(v),
 								&"`default`, `dot` or `comma`",
-							))
+							));
 						}
 					};
 					seen_decimal_separator_style = true;

cli/src/config.rs

@@ -38,7 +38,7 @@ impl serde::de::Visitor<'_> for CustomUnitAttributeVisitor {
 						"is-long-prefix",
 						"alias",
 					],
-				))
+				));
 			}
 		})
 	}
@@ -82,7 +82,9 @@ impl<'de> serde::Deserialize<'de> for CustomUnitDefinition {
 			type Value = CustomUnitDefinition;
 
 			fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-				formatter.write_str("a custom unit definition, with properties `singular`, `plural`, `definition` and `attribute`")
+				formatter.write_str(
+					"a custom unit definition, with properties `singular`, `plural`, `definition` and `attribute`",
+				)
 			}
 
 			fn visit_map<V: serde::de::MapAccess<'de>>(

cli/src/custom_units.rs

@@ -1,6 +1,6 @@
+use crate::Error;
 use crate::config::{self, ExchangeRateSource};
 use crate::file_paths;
-use crate::Error;
 use std::{error, fmt, fs, io::Write, time};
 
 const MAX_AGE: u64 = 86400 * 3;
@@ -126,7 +126,7 @@ fn parse_exchange_rates_un(exchange_rates: &str) -> Result<Vec<(String, f64)>, E
 			None if exchange_rates
 				== "\r\n\t</UN_OPERATIONAL_RATES>\r\n</UN_OPERATIONAL_RATES_DATASET>" =>
 			{
-				break
+				break;
 			}
 			None => return Err(err.into()),
 		};

cli/src/exchange_rates.rs

@@ -168,7 +168,7 @@ fn mark_dir_as_hidden_impl(path: &ffi::OsStr) -> Result<(), u32> {
 	use std::os::windows::ffi::OsStrExt;
 	use windows_sys::Win32::{
 		Foundation::GetLastError,
-		Storage::FileSystem::{SetFileAttributesW, FILE_ATTRIBUTE_HIDDEN},
+		Storage::FileSystem::{FILE_ATTRIBUTE_HIDDEN, SetFileAttributesW},
 	};
 
 	let path = path.encode_wide().chain(Some(0)).collect::<Vec<u16>>();

cli/src/file_paths.rs

@@ -26,7 +26,7 @@ pub fn init_prompt<'a>(
 	context: &context::Context<'a>,
 ) -> Result<PromptState<'a>, Box<dyn error::Error>> {
 	use rustyline::{
-		config::Builder, history::FileHistory, Cmd, Editor, KeyCode, KeyEvent, Modifiers, Movement,
+		Cmd, Editor, KeyCode, KeyEvent, Modifiers, Movement, config::Builder, history::FileHistory,
 	};
 
 	let mut rl = Editor::<helper::Helper<'_>, FileHistory>::with_config(

cli/src/terminal.rs

@@ -6,7 +6,7 @@ use crate::num::{Base, FormattingStyle, Number, Range, RangeBound};
 use crate::result::FResult;
 use crate::scope::Scope;
 use crate::serialize::{Deserialize, Serialize};
-use crate::value::{built_in_function::BuiltInFunction, ApplyMulHandling, Value};
+use crate::value::{ApplyMulHandling, Value, built_in_function::BuiltInFunction};
 use crate::{Attrs, Context, DecimalSeparatorStyle};
 use std::borrow::Cow;
 use std::sync::Arc;

core/src/ast.rs

@@ -11,7 +11,7 @@ pub(crate) use day_of_week::DayOfWeek;
 pub(crate) use month::Month;
 use year::Year;
 
-use crate::{error::FendError, ident::Ident, result::FResult, value::Value, Interrupt};
+use crate::{Interrupt, error::FendError, ident::Ident, result::FResult, value::Value};
 
 #[derive(Copy, Clone, Eq, PartialEq)]
 pub(crate) struct Date {

core/src/date.rs

@@ -1,5 +1,5 @@
-use crate::result::FResult;
 use crate::FendError;
+use crate::result::FResult;
 use crate::{Deserialize, Serialize};
 use std::fmt;
 use std::io;

core/src/date/day.rs

@@ -1,5 +1,5 @@
-use crate::result::FResult;
 use crate::FendError;
+use crate::result::FResult;
 use crate::{
 	date::Year,
 	serialize::{Deserialize, Serialize},

core/src/date/month.rs

@@ -13,11 +13,7 @@ fn parse_char(s: &str) -> Result<(char, &str), ()> {
 
 fn parse_specific_char(s: &str, c: char) -> Result<&str, ()> {
 	let (ch, s) = parse_char(s)?;
-	if ch == c {
-		Ok(s)
-	} else {
-		Err(())
-	}
+	if ch == c { Ok(s) } else { Err(()) }
 }
 
 fn parse_digit(s: &str) -> Result<(i32, &str), ()> {

core/src/date/parser.rs

@@ -47,11 +47,7 @@ impl Year {
 	}
 
 	pub(crate) fn number_of_days(self) -> u16 {
-		if self.is_leap_year() {
-			366
-		} else {
-			365
-		}
+		if self.is_leap_year() { 366 } else { 365 }
 	}
 
 	pub(crate) fn serialize(self, write: &mut impl io::Write) -> FResult<()> {