mirror of https://github.com/kdl-org/kdl-rs.git
use Self where possible
This commit is contained in:
parent
992e3292d5
commit
0fa0f513b3
|
|
@ -457,7 +457,7 @@ impl KdlDocument {
|
||||||
#[cfg(feature = "v1")]
|
#[cfg(feature = "v1")]
|
||||||
impl From<kdlv1::KdlDocument> for KdlDocument {
|
impl From<kdlv1::KdlDocument> for KdlDocument {
|
||||||
fn from(value: kdlv1::KdlDocument) -> Self {
|
fn from(value: kdlv1::KdlDocument) -> Self {
|
||||||
KdlDocument {
|
Self {
|
||||||
nodes: value.nodes().iter().map(|x| x.clone().into()).collect(),
|
nodes: value.nodes().iter().map(|x| x.clone().into()).collect(),
|
||||||
format: Some(KdlDocumentFormat {
|
format: Some(KdlDocumentFormat {
|
||||||
leading: value.leading().unwrap_or("").into(),
|
leading: value.leading().unwrap_or("").into(),
|
||||||
|
|
|
||||||
|
|
@ -385,7 +385,7 @@ impl KdlEntry {
|
||||||
#[cfg(feature = "v1")]
|
#[cfg(feature = "v1")]
|
||||||
impl From<kdlv1::KdlEntry> for KdlEntry {
|
impl From<kdlv1::KdlEntry> for KdlEntry {
|
||||||
fn from(value: kdlv1::KdlEntry) -> Self {
|
fn from(value: kdlv1::KdlEntry) -> Self {
|
||||||
KdlEntry {
|
Self {
|
||||||
ty: value.ty().map(|x| x.clone().into()),
|
ty: value.ty().map(|x| x.clone().into()),
|
||||||
value: value.value().clone().into(),
|
value: value.value().clone().into(),
|
||||||
name: value.name().map(|x| x.clone().into()),
|
name: value.name().map(|x| x.clone().into()),
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,7 @@ impl Diagnostic for KdlDiagnostic {
|
||||||
impl From<kdlv1::KdlError> for KdlError {
|
impl From<kdlv1::KdlError> for KdlError {
|
||||||
fn from(value: kdlv1::KdlError) -> Self {
|
fn from(value: kdlv1::KdlError) -> Self {
|
||||||
let input = Arc::new(value.input);
|
let input = Arc::new(value.input);
|
||||||
KdlError {
|
Self {
|
||||||
input: input.clone(),
|
input: input.clone(),
|
||||||
diagnostics: vec![KdlDiagnostic {
|
diagnostics: vec![KdlDiagnostic {
|
||||||
input,
|
input,
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ pub struct FormatConfigBuilder<'a>(FormatConfig<'a>);
|
||||||
impl<'a> FormatConfigBuilder<'a> {
|
impl<'a> FormatConfigBuilder<'a> {
|
||||||
/// Creates a new [`FormatConfig`] builder with default configuration.
|
/// Creates a new [`FormatConfig`] builder with default configuration.
|
||||||
pub const fn new() -> Self {
|
pub const fn new() -> Self {
|
||||||
FormatConfigBuilder(FormatConfig {
|
Self(FormatConfig {
|
||||||
indent_level: 0,
|
indent_level: 0,
|
||||||
indent: " ",
|
indent: " ",
|
||||||
no_comments: false,
|
no_comments: false,
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ impl KdlIdentifier {
|
||||||
#[cfg(feature = "v1")]
|
#[cfg(feature = "v1")]
|
||||||
impl From<kdlv1::KdlIdentifier> for KdlIdentifier {
|
impl From<kdlv1::KdlIdentifier> for KdlIdentifier {
|
||||||
fn from(value: kdlv1::KdlIdentifier) -> Self {
|
fn from(value: kdlv1::KdlIdentifier) -> Self {
|
||||||
KdlIdentifier {
|
Self {
|
||||||
value: value.value().into(),
|
value: value.value().into(),
|
||||||
repr: value.repr().map(|x| x.into()),
|
repr: value.repr().map(|x| x.into()),
|
||||||
#[cfg(feature = "span")]
|
#[cfg(feature = "span")]
|
||||||
|
|
|
||||||
18
src/value.rs
18
src/value.rs
|
|
@ -265,15 +265,15 @@ where
|
||||||
impl From<kdlv1::KdlValue> for KdlValue {
|
impl From<kdlv1::KdlValue> for KdlValue {
|
||||||
fn from(value: kdlv1::KdlValue) -> Self {
|
fn from(value: kdlv1::KdlValue) -> Self {
|
||||||
match value {
|
match value {
|
||||||
kdlv1::KdlValue::RawString(s) => KdlValue::String(s),
|
kdlv1::KdlValue::RawString(s) => Self::String(s),
|
||||||
kdlv1::KdlValue::String(s) => KdlValue::String(s),
|
kdlv1::KdlValue::String(s) => Self::String(s),
|
||||||
kdlv1::KdlValue::Base2(i) => KdlValue::Integer(i.into()),
|
kdlv1::KdlValue::Base2(i) => Self::Integer(i.into()),
|
||||||
kdlv1::KdlValue::Base8(i) => KdlValue::Integer(i.into()),
|
kdlv1::KdlValue::Base8(i) => Self::Integer(i.into()),
|
||||||
kdlv1::KdlValue::Base10(i) => KdlValue::Integer(i.into()),
|
kdlv1::KdlValue::Base10(i) => Self::Integer(i.into()),
|
||||||
kdlv1::KdlValue::Base10Float(f) => KdlValue::Float(f),
|
kdlv1::KdlValue::Base10Float(f) => Self::Float(f),
|
||||||
kdlv1::KdlValue::Base16(i) => KdlValue::Integer(i.into()),
|
kdlv1::KdlValue::Base16(i) => Self::Integer(i.into()),
|
||||||
kdlv1::KdlValue::Bool(b) => KdlValue::Bool(b),
|
kdlv1::KdlValue::Bool(b) => Self::Bool(b),
|
||||||
kdlv1::KdlValue::Null => KdlValue::Null,
|
kdlv1::KdlValue::Null => Self::Null,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue