Skip to content

Commit 9b3592f

Browse files
style: fmt + clippy
1 parent b97b57c commit 9b3592f

File tree

3 files changed

+50
-27
lines changed

3 files changed

+50
-27
lines changed

python/src/pyrudof_lib.rs

Lines changed: 47 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -581,27 +581,41 @@ impl PyRudof {
581581
/// Raises:
582582
/// RudofError: If ShapeMap is malformed.
583583
#[pyo3(signature = (str, format=None, base_nodes=None, base_shapes=None))]
584-
pub fn read_shapemap_str(&mut self, str: &str, format: Option<&PyShapeMapFormat>, base_nodes: Option<&str>, base_shapes: Option<&str>) -> PyResult<()> {
584+
pub fn read_shapemap_str(
585+
&mut self,
586+
str: &str,
587+
format: Option<&PyShapeMapFormat>,
588+
base_nodes: Option<&str>,
589+
base_shapes: Option<&str>,
590+
) -> PyResult<()> {
585591
let format = cnv_shapemap_format(format).unwrap_or(&ShapeMapFormat::Compact);
586592

587593
let base_nodes_iri = if let Some(base) = base_nodes {
588-
Some(IriS::from_str(base).map_err(|e| RudofError::BaseIriError {
589-
str: base.to_string(),
590-
error: format!("{e}"),
591-
}).map_err(cnv_err)?)
594+
Some(
595+
IriS::from_str(base)
596+
.map_err(|e| RudofError::BaseIriError {
597+
str: base.to_string(),
598+
error: format!("{e}"),
599+
})
600+
.map_err(cnv_err)?,
601+
)
592602
} else {
593603
None
594604
};
595605

596606
let base_shapes_iri = if let Some(base) = base_shapes {
597-
Some(IriS::from_str(base).map_err(|e| RudofError::BaseIriError {
598-
str: base.to_string(),
599-
error: format!("{e}"),
600-
}).map_err(cnv_err)?)
607+
Some(
608+
IriS::from_str(base)
609+
.map_err(|e| RudofError::BaseIriError {
610+
str: base.to_string(),
611+
error: format!("{e}"),
612+
})
613+
.map_err(cnv_err)?,
614+
)
601615
} else {
602616
None
603617
};
604-
618+
605619
self.inner
606620
.read_shapemap(str.as_bytes(), "String", format, &base_nodes_iri, &base_shapes_iri)
607621
.map_err(cnv_err)?;
@@ -619,7 +633,13 @@ impl PyRudof {
619633
/// Raises:
620634
/// RudofError: If file/URL cannot be read or ShapeMap is malformed.
621635
#[pyo3(signature = (input, format=None, base_nodes=None, base_shapes=None))]
622-
pub fn read_shapemap(&mut self, input: &str, format: Option<&PyShapeMapFormat>, base_nodes: Option<&str>, base_shapes: Option<&str>) -> PyResult<()> {
636+
pub fn read_shapemap(
637+
&mut self,
638+
input: &str,
639+
format: Option<&PyShapeMapFormat>,
640+
base_nodes: Option<&str>,
641+
base_shapes: Option<&str>,
642+
) -> PyResult<()> {
623643
let format = cnv_shapemap_format(format);
624644
let mime = if let Some(format) = format {
625645
format.mime_type()
@@ -630,19 +650,27 @@ impl PyRudof {
630650
let reader = get_reader(input, Some(mime), "Shapemap")?;
631651

632652
let base_nodes_iri = if let Some(base) = base_nodes {
633-
Some(IriS::from_str(base).map_err(|e| RudofError::BaseIriError {
634-
str: base.to_string(),
635-
error: format!("{e}"),
636-
}).map_err(cnv_err)?)
653+
Some(
654+
IriS::from_str(base)
655+
.map_err(|e| RudofError::BaseIriError {
656+
str: base.to_string(),
657+
error: format!("{e}"),
658+
})
659+
.map_err(cnv_err)?,
660+
)
637661
} else {
638662
None
639663
};
640664

641665
let base_shapes_iri = if let Some(base) = base_shapes {
642-
Some(IriS::from_str(base).map_err(|e| RudofError::BaseIriError {
643-
str: base.to_string(),
644-
error: format!("{e}"),
645-
}).map_err(cnv_err)?)
666+
Some(
667+
IriS::from_str(base)
668+
.map_err(|e| RudofError::BaseIriError {
669+
str: base.to_string(),
670+
error: format!("{e}"),
671+
})
672+
.map_err(cnv_err)?,
673+
)
646674
} else {
647675
None
648676
};

rudof_cli/src/commands/shex_validate.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl Command for ShexValidateCommand {
9494
&shapemap_format.into(),
9595
&self.args.node,
9696
&self.args.shape,
97-
&self.args.base_data
97+
&self.args.base_data,
9898
)
9999
.map_err(anyhow::Error::from)?;
100100

rudof_lib/src/rudof.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1566,16 +1566,11 @@ impl Rudof {
15661566

15671567
// Load shapemap if provided
15681568
if let Some(shapemap_input) = shapemap {
1569-
self.load_shapemap(
1570-
shapemap_input,
1571-
shapemap_format,
1572-
base_data,
1573-
base_schema,
1574-
)?;
1569+
self.load_shapemap(shapemap_input, shapemap_format, base_data, base_schema)?;
15751570
}
15761571

15771572
// Add individual node/shape pair if provided
1578-
self.add_node_shape_to_shapemap(node, shape, base_data,base_schema)?;
1573+
self.add_node_shape_to_shapemap(node, shape, base_data, base_schema)?;
15791574

15801575
// Perform validation
15811576
self.validate_shex()

0 commit comments

Comments
 (0)