stable rust, update deps, format

Author: TymanWasTaken

Cargo.lock

@@ -21,20 +21,21 @@ license = { workspace = true }
 publish = { workspace = true }
 
 [dependencies]
-actix-web = { version = "4.11.0", features = ["http2"] }
-base16ct = { version = "0.2.0", features = ["std"] }
+actix-web = { version = "4.12.1", features = ["http2"] }
+base16ct = { version = "0.3.0", features = ["alloc"] }
 clap = { version = "4.5.41", features = ["derive", "env"] }
 documented = "0.9.2"
 env_logger = "0.11.8"
 maven = { version = "*", path = "maven" }
-moka = { version = "=0.12.11", features = ["future"] }
+moka = { version = "0.12.12", features = ["future"] }
 prometheus-client = "0.24.0"
-reqwest = { version = "0.12.22", default-features = false, features = ["charset", "http2", "system-proxy", "json", "rustls-tls"] }
+reqwest = { version = "0.13.1", default-features = false, features = ["charset", "http2", "system-proxy", "json", "rustls-no-provider"] }
+rustls = { version = "0.23.35", default-features = false, features = ["ring", "std", "tls12", "logging"] }
 semver = "1.0.26"
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_variant = "0.1.3"
-sha2 = "0.11.0-rc.0"
+sha2 = "0.11.0-rc.3"
 thiserror = "2.0.12"
 tokio = { version = "1.46.1", features = ["macros", "rt-multi-thread"] }
 url = { version = "2.5.4", features = ["serde"] }

Cargo.toml

@@ -14,7 +14,7 @@ ignore = []
 # See https://spdx.org/licenses/ for list of possible licenses
 # [possible values: any SPDX 3.11 short identifier (+ optional exception)].
 allow = [ # All licenses allowed here MUST be GPLv3 compatible (https://www.gnu.org/licenses/license-list.en.html)
-    "GPL-3.0",
+    "GPL-3.0-or-later",
     "MIT",
     "Apache-2.0",
     "BSD-3-Clause",
@@ -53,5 +53,5 @@ allow-registry = [
     "https://github.com/rust-lang/crates.io-index"
 ]
 allow-git = [
-    "https://github.com/whamcloud/client_rust.git"
+    # "https://github.com/whamcloud/client_rust.git"
 ]

deny.toml

@@ -13,7 +13,7 @@ type Attributes<'a> = HashMap<Cow<'a, str>, AttributeValue<'a>>;
 pub enum AttributeValue<'a> {
 	String(#[serde_as(as = "BorrowCow")] Cow<'a, str>),
 	Boolean(bool),
-	Integer(i64)
+	Integer(i64),
 }
 
 #[derive(Debug, Deserialize)]
@@ -22,7 +22,7 @@ pub struct GradleModuleMetadata<'a> {
 	#[serde(borrow)]
 	pub component: Option<Component<'a>>,
 	#[serde(borrow, default)]
-	pub variants: Vec<Variant<'a>>
+	pub variants: Vec<Variant<'a>>,
 }
 
 #[serde_as]
@@ -38,7 +38,7 @@ pub struct Component<'a> {
 	#[serde_as(as = "Option<BorrowCow>")]
 	pub url: Option<Cow<'a, str>>,
 	#[serde(borrow, default)]
-	pub attributes: Attributes<'a>
+	pub attributes: Attributes<'a>,
 }
 
 #[serde_as]
@@ -57,7 +57,7 @@ pub struct Variant<'a> {
 	#[serde(borrow, default)]
 	pub files: Vec<File<'a>>,
 	#[serde(borrow, default)]
-	pub capabilities: Vec<Capability<'a>>
+	pub capabilities: Vec<Capability<'a>>,
 }
 
 #[serde_as]
@@ -69,7 +69,7 @@ pub struct Capability<'a> {
 	#[serde_as(as = "BorrowCow")]
 	pub name: Cow<'a, str>,
 	#[serde_as(as = "BorrowCow")]
-	pub version: Cow<'a, str>
+	pub version: Cow<'a, str>,
 }
 
 #[serde_as]
@@ -94,7 +94,7 @@ pub struct Dependency<'a> {
 	#[serde(default)]
 	pub endorse_strict_versions: bool,
 	#[serde(borrow)]
-	pub third_party_compatibility: Option<ThirdPartyCompatibility<'a>>
+	pub third_party_compatibility: Option<ThirdPartyCompatibility<'a>>,
 }
 
 #[serde_as]
@@ -109,7 +109,7 @@ pub struct DependencyConstraints<'a> {
 	pub version: Option<VersionConstraint<'a>>,
 	#[serde_as(as = "HashMap<BorrowCow, _>")]
 	#[serde(borrow, default)]
-	pub attributes: Attributes<'a>
+	pub attributes: Attributes<'a>,
 }
 
 #[serde_as]
@@ -128,7 +128,7 @@ pub struct File<'a> {
 	#[serde_as(as = "BorrowCow")]
 	pub sha512: Cow<'a, str>,
 	#[serde_as(as = "BorrowCow")]
-	pub md5: Cow<'a, str>
+	pub md5: Cow<'a, str>,
 }
 
 #[serde_as]
@@ -143,7 +143,7 @@ pub struct VersionConstraint<'a> {
 	pub strictly: Option<Cow<'a, str>>,
 	#[serde(default)]
 	#[serde_as(as = "Vec<BorrowCow>")]
-	pub rejects: Vec<Cow<'a, str>>
+	pub rejects: Vec<Cow<'a, str>>,
 }
 
 #[serde_as]
@@ -153,14 +153,14 @@ pub struct Excludes<'a> {
 	#[serde_as(as = "BorrowCow")]
 	pub group: Cow<'a, str>,
 	#[serde_as(as = "BorrowCow")]
-	pub module: Cow<'a, str>
+	pub module: Cow<'a, str>,
 }
 
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ThirdPartyCompatibility<'a> {
 	#[serde(borrow)]
-	pub artifact_selector: ArtifactSelector<'a>
+	pub artifact_selector: ArtifactSelector<'a>,
 }
 
 #[serde_as]
@@ -174,7 +174,7 @@ pub struct ArtifactSelector<'a> {
 	#[serde_as(as = "BorrowCow")]
 	pub extension: Cow<'a, str>,
 	#[serde_as(as = "BorrowCow")]
-	pub classifier: Cow<'a, str>
+	pub classifier: Cow<'a, str>,
 }
 
 impl<'a> GradleModuleMetadata<'a> {
@@ -189,7 +189,7 @@ mod tests {
 
 	const EXAMPLES: &[&str] = &[
 		include_str!("../../tests/module/valid_metadata_1.module"),
-		include_str!("../../tests/module/valid_metadata_2.module")
+		include_str!("../../tests/module/valid_metadata_2.module"),
 	];
 
 	#[test]

flake.lock

@@ -17,7 +17,7 @@ pub struct MavenArtifactMetadata<'a> {
 	pub artifact_id: Cow<'a, str>,
 	/// Versioning information about this artifact
 	#[serde(borrow)]
-	pub versioning: ArtifactVersioning<'a>
+	pub versioning: ArtifactVersioning<'a>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -35,14 +35,14 @@ pub struct ArtifactVersioning<'a> {
 	pub versions: Vec<Cow<'a, str>>,
 	/// When the metadata was last updated
 	#[serde(deserialize_with = "crate::serde::deserialize_maven_timestamp")]
-	pub last_updated: DateTime<Utc>
+	pub last_updated: DateTime<Utc>,
 }
 
 impl<'a> MavenArtifactMetadata<'a> {
 	pub fn get_metadata_url(
 		repository_url: impl AsRef<str>,
 		group_id: impl Into<Cow<'a, str>>,
-		artifact_id: impl Into<Cow<'a, str>>
+		artifact_id: impl Into<Cow<'a, str>>,
 	) -> String {
 		let repository_url = repository_url.as_ref();
 
@@ -59,7 +59,7 @@ impl<'a> MavenArtifactMetadata<'a> {
 			group_id
 				.into()
 				.chars()
-				.map(|c| if c == '.' { '/' } else { c })
+				.map(|c| if c == '.' { '/' } else { c }),
 		);
 		url.push('/');
 
@@ -84,14 +84,14 @@ mod tests {
 			"https://repo.polyfrost.org/releases/",
 			"cc.polyfrost",
 			"oneconfig-1.8.9-forge",
-			"https://repo.polyfrost.org/releases/cc/polyfrost/oneconfig-1.8.9-forge/maven-metadata.xml"
+			"https://repo.polyfrost.org/releases/cc/polyfrost/oneconfig-1.8.9-forge/maven-metadata.xml",
 		),
 		(
 			"https://maven.aliucord.com/snapshots",
 			"com.aliucord",
 			"gradle",
-			"https://maven.aliucord.com/snapshots/com/aliucord/gradle/maven-metadata.xml"
-		)
+			"https://maven.aliucord.com/snapshots/com/aliucord/gradle/maven-metadata.xml",
+		),
 	];
 
 	#[test]

maven/src/parsing/gradle.rs

@@ -8,7 +8,7 @@ use serde::{Deserialize, Deserializer};
 use serde_with::{BorrowCow, serde_as};
 
 pub(crate) fn deserialize_maven_timestamp<'de, D: Deserializer<'de>>(
-	deserializer: D
+	deserializer: D,
 ) -> Result<DateTime<Utc>, D::Error> {
 	let s = Cow::<'de, str>::deserialize(deserializer)?;
 
@@ -18,7 +18,7 @@ pub(crate) fn deserialize_maven_timestamp<'de, D: Deserializer<'de>>(
 }
 
 pub(crate) fn derserialize_version_list<'de, D: Deserializer<'de>>(
-	deserializer: D
+	deserializer: D,
 ) -> Result<Vec<Cow<'de, str>>, D::Error> {
 	/// Represents
 	/// ```xml
@@ -34,7 +34,7 @@ pub(crate) fn derserialize_version_list<'de, D: Deserializer<'de>>(
 	struct VersionList<'a> {
 		#[serde(borrow, default)]
 		#[serde_as(as = "Vec<BorrowCow>")]
-		version: Vec<Cow<'a, str>>
+		version: Vec<Cow<'a, str>>,
 	}
 
 	Ok(VersionList::deserialize(deserializer)?.version)

maven/src/parsing/maven.rs

@@ -7,14 +7,14 @@ pub struct ArtifactCoordinate<'a> {
 	pub(crate) version: Cow<'a, str>,
 	pub(crate) base_version: Cow<'a, str>,
 	pub(crate) classifier: Cow<'a, str>,
-	pub(crate) extension: Cow<'a, str>
+	pub(crate) extension: Cow<'a, str>,
 }
 
 impl<'a> ArtifactCoordinate<'a> {
 	pub fn new(
 		group_id: impl Into<Cow<'a, str>>,
 		artifact_id: impl Into<Cow<'a, str>>,
-		version: impl Into<Cow<'a, str>>
+		version: impl Into<Cow<'a, str>>,
 	) -> Self {
 		let version = version.into();
 		ArtifactCoordinate {
@@ -23,21 +23,33 @@ impl<'a> ArtifactCoordinate<'a> {
 			base_version: version.clone(),
 			version,
 			classifier: "".into(),
-			extension: "jar".into()
+			extension: "jar".into(),
 		}
 	}
 
-	pub fn group_id(&self) -> &str { &self.group_id }
+	pub fn group_id(&self) -> &str {
+		&self.group_id
+	}
 
-	pub fn artifact_id(&self) -> &str { &self.artifact_id }
+	pub fn artifact_id(&self) -> &str {
+		&self.artifact_id
+	}
 
-	pub fn version(&self) -> &str { &self.version }
+	pub fn version(&self) -> &str {
+		&self.version
+	}
 
-	pub fn base_version(&self) -> &str { &self.base_version }
+	pub fn base_version(&self) -> &str {
+		&self.base_version
+	}
 
-	pub fn classifier(&self) -> &str { &self.classifier }
+	pub fn classifier(&self) -> &str {
+		&self.classifier
+	}
 
-	pub fn extension(&self) -> &str { &self.extension }
+	pub fn extension(&self) -> &str {
+		&self.extension
+	}
 
 	pub fn with_base_version(mut self, base_version: impl Into<Cow<'a, str>>) -> Self {
 		self.base_version = base_version.into();