Skip to content

Commit 68449e8

Browse files
alanbldclaude
andcommitted
style: Apply cargo fmt formatting
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 8541e69 commit 68449e8

File tree

12 files changed

+166
-121
lines changed

12 files changed

+166
-121
lines changed

crates/utf8dok-ooxml/src/archive.rs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,10 @@ mod tests {
474474

475475
// Both methods should return the same result
476476
assert_eq!(archive.contains("test.xml"), archive.has_file("test.xml"));
477-
assert_eq!(archive.contains("missing.xml"), archive.has_file("missing.xml"));
477+
assert_eq!(
478+
archive.contains("missing.xml"),
479+
archive.has_file("missing.xml")
480+
);
478481
}
479482

480483
#[test]
@@ -559,8 +562,7 @@ mod tests {
559562
let mut manifest = Manifest::new();
560563
manifest.add_element(
561564
"source",
562-
crate::manifest::ElementMeta::new("source.adoc")
563-
.with_hash("abc123"),
565+
crate::manifest::ElementMeta::new("source.adoc").with_hash("abc123"),
564566
);
565567

566568
// Set manifest
@@ -639,14 +641,8 @@ mod tests {
639641
archive.write_utf8dok_string("utf8dok.toml", "[template]\npath = \"t.dotx\"");
640642

641643
let mut manifest = Manifest::new();
642-
manifest.add_element(
643-
"source",
644-
crate::manifest::ElementMeta::new("source.adoc"),
645-
);
646-
manifest.add_element(
647-
"config",
648-
crate::manifest::ElementMeta::new("utf8dok.toml"),
649-
);
644+
manifest.add_element("source", crate::manifest::ElementMeta::new("source.adoc"));
645+
manifest.add_element("config", crate::manifest::ElementMeta::new("utf8dok.toml"));
650646
archive.set_manifest(&manifest).unwrap();
651647

652648
// Verify all parts exist

crates/utf8dok-ooxml/src/conversion.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -635,10 +635,7 @@ mod tests {
635635

636636
#[test]
637637
fn test_generate_anchor_special_chars() {
638-
assert_eq!(
639-
generate_anchor("What's New?"),
640-
Some("whats-new".into())
641-
);
638+
assert_eq!(generate_anchor("What's New?"), Some("whats-new".into()));
642639
assert_eq!(
643640
generate_anchor("C++ Programming"),
644641
Some("c-programming".into())
@@ -668,10 +665,7 @@ mod tests {
668665
fn test_extract_plain_text_formatted() {
669666
let inlines = vec![
670667
Inline::Text("Plain ".to_string()),
671-
Inline::Format(
672-
FormatType::Bold,
673-
Box::new(Inline::Text("bold".to_string())),
674-
),
668+
Inline::Format(FormatType::Bold, Box::new(Inline::Text("bold".to_string()))),
675669
Inline::Text(" text".to_string()),
676670
];
677671
assert_eq!(extract_plain_text(&inlines), "Plain bold text");
@@ -802,7 +796,10 @@ mod tests {
802796
// Verify both styles and relationships are accessible
803797
assert!(ctx.styles.is_some());
804798
assert!(ctx.relationships.is_some());
805-
assert_eq!(ctx.relationships.unwrap().get("rId1"), Some("https://example.com"));
799+
assert_eq!(
800+
ctx.relationships.unwrap().get("rId1"),
801+
Some("https://example.com")
802+
);
806803
}
807804

808805
#[test]
@@ -1099,7 +1096,9 @@ mod tests {
10991096
// Unicode-only text may return None if all chars are filtered
11001097
if let Some(a) = anchor {
11011098
// If it returns Some, should be ASCII-safe
1102-
assert!(a.chars().all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_'));
1099+
assert!(a
1100+
.chars()
1101+
.all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_'));
11031102
}
11041103
// Not panicking is the main test
11051104
}

crates/utf8dok-ooxml/src/extract.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1986,7 +1986,10 @@ mod tests {
19861986
assert_eq!(metadata.title, Some("Full Document".to_string()));
19871987
assert_eq!(metadata.author, Some("Test Author".to_string()));
19881988
assert_eq!(metadata.subject, Some("Test Subject".to_string()));
1989-
assert_eq!(metadata.keywords, Some("test, document, metadata".to_string()));
1989+
assert_eq!(
1990+
metadata.keywords,
1991+
Some("test, document, metadata".to_string())
1992+
);
19901993
assert_eq!(metadata.revision, Some("5".to_string()));
19911994
assert_eq!(metadata.created, Some("2025-01-01T00:00:00Z".to_string()));
19921995
assert_eq!(metadata.modified, Some("2025-06-15T12:00:00Z".to_string()));
@@ -2009,8 +2012,7 @@ mod tests {
20092012

20102013
#[test]
20112014
fn test_extractor_with_force_parse_builder() {
2012-
let extractor = AsciiDocExtractor::new()
2013-
.with_force_parse(true);
2015+
let extractor = AsciiDocExtractor::new().with_force_parse(true);
20142016

20152017
assert!(extractor.force_parse);
20162018
}

crates/utf8dok-ooxml/src/image.rs

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ mod tests {
338338
assert_eq!(emu_to_pixels(4762), 0); // Just under 0.5
339339
assert_eq!(emu_to_pixels(4763), 1); // Just over 0.5, rounds to 1
340340
assert_eq!(emu_to_pixels(9525), 1); // Exactly 1 pixel
341-
// 9525 * 1.5 = 14287.5, so 14288 is just over 1.5
341+
// 9525 * 1.5 = 14287.5, so 14288 is just over 1.5
342342
assert_eq!(emu_to_pixels(14288), 2); // Just over 1.5 pixels rounds to 2
343343
assert_eq!(emu_to_pixels(14287), 1); // Just under 1.5 pixels rounds to 1
344344
}
@@ -383,9 +383,15 @@ mod tests {
383383

384384
#[test]
385385
fn test_content_type_unknown_extension() {
386-
assert_eq!(content_type_for_extension("xyz"), "application/octet-stream");
386+
assert_eq!(
387+
content_type_for_extension("xyz"),
388+
"application/octet-stream"
389+
);
387390
assert_eq!(content_type_for_extension(""), "application/octet-stream");
388-
assert_eq!(content_type_for_extension("unknown"), "application/octet-stream");
391+
assert_eq!(
392+
content_type_for_extension("unknown"),
393+
"application/octet-stream"
394+
);
389395
}
390396

391397
#[test]
@@ -435,7 +441,12 @@ mod tests {
435441
assert!(img.is_anchor());
436442
assert!(!img.is_inline());
437443

438-
if let ImagePosition::Anchor { horizontal, vertical, wrap } = img.position {
444+
if let ImagePosition::Anchor {
445+
horizontal,
446+
vertical,
447+
wrap,
448+
} = img.position
449+
{
439450
assert_eq!(horizontal, 100000);
440451
assert_eq!(vertical, 200000);
441452
assert_eq!(wrap, WrapType::Tight);

crates/utf8dok-ooxml/src/manifest.rs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,10 @@ mod tests {
407407
assert_eq!(retrieved.type_, "diagram");
408408
assert_eq!(retrieved.source, Some("diagrams/flow.mmd".to_string()));
409409
assert_eq!(retrieved.hash, Some("sha256:abc123def456".to_string()));
410-
assert_eq!(retrieved.description, Some("System architecture overview".to_string()));
410+
assert_eq!(
411+
retrieved.description,
412+
Some("System architecture overview".to_string())
413+
);
411414
}
412415

413416
#[test]
@@ -452,7 +455,12 @@ mod tests {
452455
// Empty manifest should have version and empty elements
453456
let parsed: serde_json::Value = serde_json::from_str(&json_str).unwrap();
454457
assert_eq!(parsed.get("version").unwrap(), "1.0");
455-
assert!(parsed.get("elements").unwrap().as_object().unwrap().is_empty());
458+
assert!(parsed
459+
.get("elements")
460+
.unwrap()
461+
.as_object()
462+
.unwrap()
463+
.is_empty());
456464
}
457465

458466
#[test]
@@ -461,8 +469,8 @@ mod tests {
461469
.with_source("doc.adoc")
462470
.with_hash("hash1")
463471
.with_description("desc1")
464-
.with_source("updated.adoc") // Can update
465-
.with_hash("hash2"); // Can update again
472+
.with_source("updated.adoc") // Can update
473+
.with_hash("hash2"); // Can update again
466474

467475
assert_eq!(meta.type_, "source");
468476
assert_eq!(meta.source, Some("updated.adoc".to_string()));
@@ -492,8 +500,7 @@ mod tests {
492500
fn test_manifest_unicode_values() {
493501
let mut manifest = Manifest::new();
494502

495-
let meta = ElementMeta::new("document")
496-
.with_description("文档说明 - Document with 日本語");
503+
let meta = ElementMeta::new("document").with_description("文档说明 - Document with 日本語");
497504

498505
manifest.add_element("doc", meta);
499506

crates/utf8dok-ooxml/src/relationships.rs

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -701,10 +701,7 @@ mod tests {
701701
let mut rels = Relationships::new();
702702

703703
// Add relationships with special characters in target
704-
rels.add(
705-
"path/with spaces/file.xml".to_string(),
706-
"type".to_string(),
707-
);
704+
rels.add("path/with spaces/file.xml".to_string(), "type".to_string());
708705
rels.add(
709706
"unicode/日本語/ファイル.xml".to_string(),
710707
"type".to_string(),
@@ -737,7 +734,10 @@ mod tests {
737734

738735
// Verify all are retrievable
739736
assert_eq!(rels.get(&http_id), Some("https://example.com/page"));
740-
assert_eq!(rels.get(&ftp_id), Some("ftp://files.example.com/download.zip"));
737+
assert_eq!(
738+
rels.get(&ftp_id),
739+
Some("ftp://files.example.com/download.zip")
740+
);
741741
assert_eq!(rels.get(&mail_id), Some("mailto:user@example.com"));
742742
}
743743

@@ -800,7 +800,11 @@ mod tests {
800800
Relationships::TYPE_HYPERLINK,
801801
];
802802
let unique: std::collections::HashSet<_> = types.iter().collect();
803-
assert_eq!(unique.len(), types.len(), "All type constants should be unique");
803+
assert_eq!(
804+
unique.len(),
805+
types.len(),
806+
"All type constants should be unique"
807+
);
804808
}
805809

806810
#[test]
@@ -810,13 +814,18 @@ mod tests {
810814
rels.add_image("media/img1.png");
811815
rels.add_image("media/img2.jpg");
812816
rels.add_hyperlink("https://example.com");
813-
rels.add("styles.xml".to_string(), Relationships::TYPE_STYLES.to_string());
817+
rels.add(
818+
"styles.xml".to_string(),
819+
Relationships::TYPE_STYLES.to_string(),
820+
);
814821

815822
// Count by type
816-
let image_count = rels.iter()
823+
let image_count = rels
824+
.iter()
817825
.filter(|(_, rel)| rel.rel_type == Relationships::TYPE_IMAGE)
818826
.count();
819-
let link_count = rels.iter()
827+
let link_count = rels
828+
.iter()
820829
.filter(|(_, rel)| rel.rel_type == Relationships::TYPE_HYPERLINK)
821830
.count();
822831

crates/utf8dok-ooxml/src/style_contract_validator.rs

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,9 @@ mod tests {
963963

964964
let result = StyleContractValidator::validate_invariants(&contract);
965965
assert!(result.has_errors());
966-
assert!(result.errors()[0].message.contains("not a valid XML NCName"));
966+
assert!(result.errors()[0]
967+
.message
968+
.contains("not a valid XML NCName"));
967969
}
968970

969971
#[test]
@@ -1289,11 +1291,7 @@ mod tests {
12891291
);
12901292

12911293
let result = StyleContractValidator::validate_schema(&contract);
1292-
assert!(
1293-
result.is_valid(),
1294-
"Heading level {} should be valid",
1295-
level
1296-
);
1294+
assert!(result.is_valid(), "Heading level {} should be valid", level);
12971295
}
12981296
}
12991297

@@ -1408,7 +1406,8 @@ mod tests {
14081406
let mut referenced = HashSet::new();
14091407
referenced.insert("section-1".to_string());
14101408

1411-
let result = StyleContractValidator::validate_completeness_rendering(&contract, &referenced);
1409+
let result =
1410+
StyleContractValidator::validate_completeness_rendering(&contract, &referenced);
14121411
assert!(result.is_valid());
14131412
}
14141413

@@ -1534,33 +1533,43 @@ mod tests {
15341533
fn test_is_valid_semantic_id_valid_ids() {
15351534
assert!(StyleContractValidator::is_valid_semantic_id("simple"));
15361535
assert!(StyleContractValidator::is_valid_semantic_id("with-dashes"));
1537-
assert!(StyleContractValidator::is_valid_semantic_id("section-1-intro"));
1536+
assert!(StyleContractValidator::is_valid_semantic_id(
1537+
"section-1-intro"
1538+
));
15381539
assert!(StyleContractValidator::is_valid_semantic_id("a"));
15391540
assert!(StyleContractValidator::is_valid_semantic_id("abc123"));
15401541
// Digits allowed as first character
1541-
assert!(StyleContractValidator::is_valid_semantic_id("123-numeric-start"));
1542+
assert!(StyleContractValidator::is_valid_semantic_id(
1543+
"123-numeric-start"
1544+
));
15421545
}
15431546

15441547
#[test]
15451548
fn test_is_valid_semantic_id_invalid_ids() {
15461549
assert!(!StyleContractValidator::is_valid_semantic_id(""));
15471550
assert!(!StyleContractValidator::is_valid_semantic_id("has spaces"));
15481551
// Underscores not allowed
1549-
assert!(!StyleContractValidator::is_valid_semantic_id("with_underscore"));
1552+
assert!(!StyleContractValidator::is_valid_semantic_id(
1553+
"with_underscore"
1554+
));
15501555
assert!(!StyleContractValidator::is_valid_semantic_id(
15511556
"-starts-with-dash"
15521557
));
15531558
assert!(!StyleContractValidator::is_valid_semantic_id("has.dot"));
15541559
// Uppercase not allowed
1555-
assert!(!StyleContractValidator::is_valid_semantic_id("HasUppercase"));
1560+
assert!(!StyleContractValidator::is_valid_semantic_id(
1561+
"HasUppercase"
1562+
));
15561563
}
15571564

15581565
#[test]
15591566
fn test_is_valid_xml_ncname_valid_names() {
15601567
assert!(StyleContractValidator::is_valid_xml_ncname("_Toc123"));
15611568
assert!(StyleContractValidator::is_valid_xml_ncname("_Ref456"));
15621569
assert!(StyleContractValidator::is_valid_xml_ncname("_Hlk789"));
1563-
assert!(StyleContractValidator::is_valid_xml_ncname("SimpleBookmark"));
1570+
assert!(StyleContractValidator::is_valid_xml_ncname(
1571+
"SimpleBookmark"
1572+
));
15641573
assert!(StyleContractValidator::is_valid_xml_ncname("_underscore"));
15651574
assert!(StyleContractValidator::is_valid_xml_ncname("a"));
15661575
}
@@ -1571,7 +1580,9 @@ mod tests {
15711580
assert!(!StyleContractValidator::is_valid_xml_ncname(
15721581
"123StartWithNumber"
15731582
));
1574-
assert!(!StyleContractValidator::is_valid_xml_ncname("-StartWithDash"));
1583+
assert!(!StyleContractValidator::is_valid_xml_ncname(
1584+
"-StartWithDash"
1585+
));
15751586
assert!(!StyleContractValidator::is_valid_xml_ncname("has space"));
15761587
assert!(!StyleContractValidator::is_valid_xml_ncname("has:colon"));
15771588
}

0 commit comments

Comments
 (0)