From 0fa0f513b30b331cac99b33e8771212cf59a2af4 Mon Sep 17 00:00:00 2001 From: adamnemecek Date: Wed, 11 Jun 2025 08:59:01 -0700 Subject: [PATCH] use Self where possible --- src/document.rs | 2 +- src/entry.rs | 2 +- src/error.rs | 2 +- src/fmt.rs | 2 +- src/identifier.rs | 2 +- src/value.rs | 18 +++++++++--------- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/document.rs b/src/document.rs index 597ea42..71c4eb2 100644 --- a/src/document.rs +++ b/src/document.rs @@ -457,7 +457,7 @@ impl KdlDocument { #[cfg(feature = "v1")] impl From for KdlDocument { fn from(value: kdlv1::KdlDocument) -> Self { - KdlDocument { + Self { nodes: value.nodes().iter().map(|x| x.clone().into()).collect(), format: Some(KdlDocumentFormat { leading: value.leading().unwrap_or("").into(), diff --git a/src/entry.rs b/src/entry.rs index fac4d47..8d8b555 100644 --- a/src/entry.rs +++ b/src/entry.rs @@ -385,7 +385,7 @@ impl KdlEntry { #[cfg(feature = "v1")] impl From for KdlEntry { fn from(value: kdlv1::KdlEntry) -> Self { - KdlEntry { + Self { ty: value.ty().map(|x| x.clone().into()), value: value.value().clone().into(), name: value.name().map(|x| x.clone().into()), diff --git a/src/error.rs b/src/error.rs index 71b0671..15b19c8 100644 --- a/src/error.rs +++ b/src/error.rs @@ -121,7 +121,7 @@ impl Diagnostic for KdlDiagnostic { impl From for KdlError { fn from(value: kdlv1::KdlError) -> Self { let input = Arc::new(value.input); - KdlError { + Self { input: input.clone(), diagnostics: vec![KdlDiagnostic { input, diff --git a/src/fmt.rs b/src/fmt.rs index 91a9b52..238fb75 100644 --- a/src/fmt.rs +++ b/src/fmt.rs @@ -43,7 +43,7 @@ pub struct FormatConfigBuilder<'a>(FormatConfig<'a>); impl<'a> FormatConfigBuilder<'a> { /// Creates a new [`FormatConfig`] builder with default configuration. pub const fn new() -> Self { - FormatConfigBuilder(FormatConfig { + Self(FormatConfig { indent_level: 0, indent: " ", no_comments: false, diff --git a/src/identifier.rs b/src/identifier.rs index 4653336..5f86b50 100644 --- a/src/identifier.rs +++ b/src/identifier.rs @@ -117,7 +117,7 @@ impl KdlIdentifier { #[cfg(feature = "v1")] impl From for KdlIdentifier { fn from(value: kdlv1::KdlIdentifier) -> Self { - KdlIdentifier { + Self { value: value.value().into(), repr: value.repr().map(|x| x.into()), #[cfg(feature = "span")] diff --git a/src/value.rs b/src/value.rs index fa506ec..a97e0dc 100644 --- a/src/value.rs +++ b/src/value.rs @@ -265,15 +265,15 @@ where impl From for KdlValue { fn from(value: kdlv1::KdlValue) -> Self { match value { - kdlv1::KdlValue::RawString(s) => KdlValue::String(s), - kdlv1::KdlValue::String(s) => KdlValue::String(s), - kdlv1::KdlValue::Base2(i) => KdlValue::Integer(i.into()), - kdlv1::KdlValue::Base8(i) => KdlValue::Integer(i.into()), - kdlv1::KdlValue::Base10(i) => KdlValue::Integer(i.into()), - kdlv1::KdlValue::Base10Float(f) => KdlValue::Float(f), - kdlv1::KdlValue::Base16(i) => KdlValue::Integer(i.into()), - kdlv1::KdlValue::Bool(b) => KdlValue::Bool(b), - kdlv1::KdlValue::Null => KdlValue::Null, + kdlv1::KdlValue::RawString(s) => Self::String(s), + kdlv1::KdlValue::String(s) => Self::String(s), + kdlv1::KdlValue::Base2(i) => Self::Integer(i.into()), + kdlv1::KdlValue::Base8(i) => Self::Integer(i.into()), + kdlv1::KdlValue::Base10(i) => Self::Integer(i.into()), + kdlv1::KdlValue::Base10Float(f) => Self::Float(f), + kdlv1::KdlValue::Base16(i) => Self::Integer(i.into()), + kdlv1::KdlValue::Bool(b) => Self::Bool(b), + kdlv1::KdlValue::Null => Self::Null, } } }