Skip to content

Commit c29a2a1

Browse files
authored
Merge pull request #46 from VolumeGraphics/prepare-0.5.3
Prepare release 0.5.3
2 parents 452c00e + b01a488 commit c29a2a1

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description = "A flexible rule-based file and folder comparison tool and crate i
44
repository = "https://github.com/VolumeGraphics/havocompare"
55
homepage = "https://github.com/VolumeGraphics/havocompare"
66
documentation = "https://docs.rs/havocompare"
7-
version = "0.5.2"
7+
version = "0.5.3"
88
edition = "2021"
99
license = "MIT"
1010
authors = ["Volume Graphics GmbH"]

config_scheme.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,15 @@
153153
"type": "object",
154154
"properties": {
155155
"ignore_keys": {
156-
"type": [
157-
"array",
158-
"null"
159-
],
156+
"default": [],
157+
"type": "array",
160158
"items": {
161159
"type": "string"
162160
}
161+
},
162+
"sort_arrays": {
163+
"default": false,
164+
"type": "boolean"
163165
}
164166
}
165167
},

src/lib.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ pub fn compare_files(
175175
) -> Difference {
176176
let file_name_nominal = nominal.as_ref().to_string_lossy();
177177
let file_name_actual = actual.as_ref().to_string_lossy();
178-
let _file_span = span!(tracing::Level::INFO, "Processing");
179-
let _file_span = _file_span.enter();
178+
let _file_span = span!(tracing::Level::INFO, "Processing").entered();
180179

181180
info!("File: {file_name_nominal} | {file_name_actual}");
182181

@@ -247,8 +246,7 @@ fn process_rule(
247246
rule: &Rule,
248247
compare_results: &mut Vec<Difference>,
249248
) -> Result<bool, Error> {
250-
let _file_span = span!(tracing::Level::INFO, "Rule");
251-
let _file_span = _file_span.enter();
249+
let _file_span = span!(tracing::Level::INFO, "Rule").entered();
252250
info!("Name: {}", rule.name.as_str());
253251
if !nominal.as_ref().is_dir() {
254252
error!(

src/report/mod.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -584,8 +584,7 @@ pub(crate) fn create_reports(
584584
rule_differences: &[RuleDifferences],
585585
report_path: impl AsRef<Path>,
586586
) -> Result<(), Error> {
587-
let _reporting_span = span!(tracing::Level::INFO, "Reporting");
588-
let _reporting_span = _reporting_span.enter();
587+
let _reporting_span = span!(tracing::Level::INFO, "Reporting").entered();
589588
let report_dir = report_path.as_ref();
590589
if report_dir.is_dir() {
591590
info!("Delete report folder");
@@ -604,8 +603,7 @@ pub(crate) fn create_json(
604603
rule_differences: &[RuleDifferences],
605604
report_path: impl AsRef<Path>,
606605
) -> Result<(), Error> {
607-
let _reporting_span = span!(tracing::Level::INFO, "JSON");
608-
let _reporting_span = _reporting_span.enter();
606+
let _reporting_span = span!(tracing::Level::INFO, "JSON").entered();
609607
let report_dir = report_path.as_ref();
610608
let writer = report_dir.join("report.json");
611609
let writer = fat_io_wrap_std(writer, &File::create)?;
@@ -617,8 +615,7 @@ pub(crate) fn create_html(
617615
rule_differences: &[RuleDifferences],
618616
report_path: impl AsRef<Path>,
619617
) -> Result<(), Error> {
620-
let _reporting_span = span!(tracing::Level::INFO, "HTML");
621-
let _reporting_span = _reporting_span.enter();
618+
let _reporting_span = span!(tracing::Level::INFO, "HTML").entered();
622619
let report_dir = report_path.as_ref();
623620

624621
let mut html_rule_differences: Vec<RenderToHtmlRuleDifferences> = Vec::new();

0 commit comments

Comments
 (0)