git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-11 15:23:02 +02:00
Code Issues Projects Releases Packages Wiki Activity

chore(deps): Replace serde_yaml with serde_yml

Browse source
This commit is contained in:
Jade Ellis 2025-09-10 20:18:00 +01:00
commit ad11417145
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
8 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Cargo.lock generated
View file

@ -921,7 +921,7 @@ dependencies = [
"log", "log",
"ruma", "ruma",
"serde_json", "serde_json",
"serde_yaml", "serde_yml",
"tokio", "tokio",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
@ -1012,7 +1012,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"serde_regex", "serde_regex",
"serde_yaml", "serde_yml",
"smallstr", "smallstr",
"smallvec", "smallvec",
"thiserror 2.0.16", "thiserror 2.0.16",
@ -1123,7 +1123,7 @@ dependencies = [
"rustyline-async", "rustyline-async",
"serde", "serde",
"serde_json", "serde_json",
"serde_yaml", "serde_yml",
"sha2", "sha2",
"termimad", "termimad",
"tokio", "tokio",
@ -2786,6 +2786,16 @@ dependencies = [
"windows-targets 0.53.3", "windows-targets 0.53.3",
] ]
[[package]]
name = "libyml"
version = "0.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3302702afa434ffa30847a83305f0a69d6abd74293b6554c18ec85c7ef30c980"
dependencies = [
"anyhow",
"version_check",
]
[[package]] [[package]]
name = "libz-sys" name = "libz-sys"
version = "1.1.22" version = "1.1.22"
@ -4807,16 +4817,18 @@ dependencies = [
] ]
[[package]] [[package]]
name = "serde_yaml" name = "serde_yml"
version = "0.9.34+deprecated" version = "0.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" checksum = "59e2dd588bf1597a252c3b920e0143eb99b0f76e4e082f4c92ce34fbc9e71ddd"
dependencies = [ dependencies = [
"indexmap 2.11.1", "indexmap 2.11.1",
"itoa", "itoa",
"libyml",
"memchr",
"ryu", "ryu",
"serde", "serde",
"unsafe-libyaml", "version_check",
] ]
[[package]] [[package]]
@ -5784,12 +5796,6 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
name = "unsafe-libyaml"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
[[package]] [[package]]
name = "untrusted" name = "untrusted"
version = "0.7.1" version = "0.7.1"

4
Cargo.toml
View file

@ -166,8 +166,8 @@ default-features = false
features = ["raw_value"] features = ["raw_value"]
# Used for appservice registration files # Used for appservice registration files
[workspace.dependencies.serde_yaml] [workspace.dependencies.serde_yml]
version = "0.9.34" version = "0.0.12"
# Used to load forbidden room/user regex from config # Used to load forbidden room/user regex from config
[workspace.dependencies.serde_regex] [workspace.dependencies.serde_regex]

2
src/admin/Cargo.toml
View file

@ -85,7 +85,7 @@ futures.workspace = true
log.workspace = true log.workspace = true
ruma.workspace = true ruma.workspace = true
serde_json.workspace = true serde_json.workspace = true
serde_yaml.workspace = true serde_yml.workspace = true
tokio.workspace = true tokio.workspace = true
tracing-subscriber.workspace = true tracing-subscriber.workspace = true
tracing.workspace = true tracing.workspace = true

4
src/admin/appservice/commands.rs
View file

@ -16,7 +16,7 @@ pub(super) async fn register(&self) -> Result {
let range = 1..checked!(body_len - 1)?; let range = 1..checked!(body_len - 1)?;
let appservice_config_body = body[range].join("\n"); let appservice_config_body = body[range].join("\n");
let parsed_config = serde_yaml::from_str(&appservice_config_body); let parsed_config = serde_yml::from_str(&appservice_config_body);
match parsed_config { match parsed_config {
| Err(e) => return Err!("Could not parse appservice config as YAML: {e}"), | Err(e) => return Err!("Could not parse appservice config as YAML: {e}"),
| Ok(registration) => match self | Ok(registration) => match self
@ -57,7 +57,7 @@ pub(super) async fn show_appservice_config(&self, appservice_identifier: String)
{ {
| None => return Err!("Appservice does not exist."), | None => return Err!("Appservice does not exist."),
| Some(config) => { | Some(config) => {
let config_str = serde_yaml::to_string(&config)?; let config_str = serde_yml::to_string(&config)?;
write!(self, "Config for {appservice_identifier}:\n\n```yaml\n{config_str}\n```") write!(self, "Config for {appservice_identifier}:\n\n```yaml\n{config_str}\n```")
}, },
} }

2
src/core/Cargo.toml
View file

@ -92,7 +92,7 @@ ruma.workspace = true
sanitize-filename.workspace = true sanitize-filename.workspace = true
serde_json.workspace = true serde_json.workspace = true
serde_regex.workspace = true serde_regex.workspace = true
serde_yaml.workspace = true serde_yml.workspace = true
serde.workspace = true serde.workspace = true
smallvec.workspace = true smallvec.workspace = true
smallstr.workspace = true smallstr.workspace = true

2
src/core/error/mod.rs
View file

@ -83,7 +83,7 @@ pub enum Error {
#[error(transparent)] #[error(transparent)]
TypedHeader(#[from] axum_extra::typed_header::TypedHeaderRejection), TypedHeader(#[from] axum_extra::typed_header::TypedHeaderRejection),
#[error(transparent)] #[error(transparent)]
Yaml(#[from] serde_yaml::Error), Yaml(#[from] serde_yml::Error),
// ruma/conduwuit // ruma/conduwuit
#[error("Arithmetic operation failed: {0}")] #[error("Arithmetic operation failed: {0}")]

2
src/service/Cargo.toml
View file

@ -105,7 +105,7 @@ rustyline-async.workspace = true
rustyline-async.optional = true rustyline-async.optional = true
serde_json.workspace = true serde_json.workspace = true
serde.workspace = true serde.workspace = true
serde_yaml.workspace = true serde_yml.workspace = true
sha2.workspace = true sha2.workspace = true
termimad.workspace = true termimad.workspace = true
termimad.optional = true termimad.optional = true

2
src/service/appservice/mod.rs
View file

@ -271,7 +271,7 @@ impl Service {
.id_appserviceregistrations .id_appserviceregistrations
.get(id) .get(id)
.await .await
.and_then(|ref bytes| serde_yaml::from_slice(bytes).map_err(Into::into)) .and_then(|ref bytes| serde_yml::from_slice(bytes).map_err(Into::into))
.map_err(|e| err!(Database("Invalid appservice {id:?} registration: {e:?}"))) .map_err(|e| err!(Database("Invalid appservice {id:?} registration: {e:?}")))
} }