Skip to content

Commit a5ddc77

Browse files
gvonnessigvonnessi
committed
chore: pass clippy --all-targets and enforce it in CI
Resolve the pre-existing clippy `--all-targets` debt so the strict gate (`cargo clippy --workspace --all-targets --all-features -- -D warnings`) exits 0, then tighten CI to keep it that way. No runtime behavior changes. Lints resolved (33 total under clippy 1.96.0): - default_trait_access (13): use concrete `zip::write::FileOptions::default()` instead of `Default::default()` in archive/reader.rs tests. - manual_contains (1): `declared.contains(&"unknown")` in conformance.rs. - module_inception (1): remove the redundant inner `mod tests` wrapper in document/tests.rs (the file is already the `tests` module); pure dedent, contents byte-identical after whitespace removal. - similar_names (18): scoped `#[allow]` on the three key-wrapping test modules in security/encryption.rs, where the `wrapper`/`wrapped` pairing is the natural and readable idiom. CI: change the clippy invocations in ci.yml (workspace + swift-bridge) and publish.yml from `--all-features` to `--all-targets --all-features` so test, bench, and example targets are linted going forward.
1 parent 3a364c7 commit a5ddc77

6 files changed

Lines changed: 608 additions & 607 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
run: cargo fmt --all -- --check
5151

5252
- name: Clippy
53-
run: cargo clippy --workspace --all-features -- -D warnings
53+
run: cargo clippy --workspace --all-targets --all-features -- -D warnings
5454

5555
docs:
5656
name: Documentation
@@ -172,7 +172,7 @@ jobs:
172172
run: cargo test --manifest-path cdx-swift-bridge/Cargo.toml
173173

174174
- name: Clippy Swift bridge
175-
run: cargo clippy --manifest-path cdx-swift-bridge/Cargo.toml -- -D warnings
175+
run: cargo clippy --manifest-path cdx-swift-bridge/Cargo.toml --all-targets -- -D warnings
176176

177177
security:
178178
name: Security Audit

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: cargo test --workspace --all-features
3636

3737
- name: Clippy
38-
run: cargo clippy --workspace --all-features -- -D warnings
38+
run: cargo clippy --workspace --all-targets --all-features -- -D warnings
3939

4040
- name: Build docs
4141
run: cargo doc --workspace --no-deps --all-features

‎cdx-core/src/archive/reader.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -475,11 +475,11 @@ mod tests {
475475
let buffer = Cursor::new(Vec::new());
476476
let mut writer = zip::ZipWriter::new(buffer);
477477
writer
478-
.start_file::<&str, ()>(CONTENT_PATH, Default::default())
478+
.start_file::<&str, ()>(CONTENT_PATH, zip::write::FileOptions::default())
479479
.unwrap();
480480
writer.write_all(b"{}").unwrap();
481481
writer
482-
.start_file::<&str, ()>(DUBLIN_CORE_PATH, Default::default())
482+
.start_file::<&str, ()>(DUBLIN_CORE_PATH, zip::write::FileOptions::default())
483483
.unwrap();
484484
writer.write_all(b"{}").unwrap();
485485
let data = writer.finish().unwrap().into_inner();
@@ -496,13 +496,13 @@ mod tests {
496496

497497
// Add manifest
498498
writer
499-
.start_file::<&str, ()>(MANIFEST_PATH, Default::default())
499+
.start_file::<&str, ()>(MANIFEST_PATH, zip::write::FileOptions::default())
500500
.unwrap();
501501
writer.write_all(br#"{"cdx":"0.1"}"#).unwrap();
502502

503503
// Add Dublin Core but no content
504504
writer
505-
.start_file::<&str, ()>(DUBLIN_CORE_PATH, Default::default())
505+
.start_file::<&str, ()>(DUBLIN_CORE_PATH, zip::write::FileOptions::default())
506506
.unwrap();
507507
writer.write_all(b"{}").unwrap();
508508

@@ -519,17 +519,17 @@ mod tests {
519519
let mut writer = zip::ZipWriter::new(buffer);
520520

521521
writer
522-
.start_file::<&str, ()>(MANIFEST_PATH, Default::default())
522+
.start_file::<&str, ()>(MANIFEST_PATH, zip::write::FileOptions::default())
523523
.unwrap();
524524
writer.write_all(b"{ invalid json }").unwrap();
525525

526526
writer
527-
.start_file::<&str, ()>(CONTENT_PATH, Default::default())
527+
.start_file::<&str, ()>(CONTENT_PATH, zip::write::FileOptions::default())
528528
.unwrap();
529529
writer.write_all(b"{}").unwrap();
530530

531531
writer
532-
.start_file::<&str, ()>(DUBLIN_CORE_PATH, Default::default())
532+
.start_file::<&str, ()>(DUBLIN_CORE_PATH, zip::write::FileOptions::default())
533533
.unwrap();
534534
writer.write_all(b"{}").unwrap();
535535

@@ -740,7 +740,7 @@ mod tests {
740740

741741
// Write content BEFORE manifest
742742
writer
743-
.start_file::<&str, ()>(CONTENT_PATH, Default::default())
743+
.start_file::<&str, ()>(CONTENT_PATH, zip::write::FileOptions::default())
744744
.unwrap();
745745
writer
746746
.write_all(br#"{"version":"0.1","blocks":[]}"#)
@@ -757,12 +757,12 @@ mod tests {
757757
"metadata": { "dublinCore": "metadata/dublin-core.json" }
758758
}"#;
759759
writer
760-
.start_file::<&str, ()>(MANIFEST_PATH, Default::default())
760+
.start_file::<&str, ()>(MANIFEST_PATH, zip::write::FileOptions::default())
761761
.unwrap();
762762
writer.write_all(manifest_json.as_bytes()).unwrap();
763763

764764
writer
765-
.start_file::<&str, ()>(DUBLIN_CORE_PATH, Default::default())
765+
.start_file::<&str, ()>(DUBLIN_CORE_PATH, zip::write::FileOptions::default())
766766
.unwrap();
767767
writer.write_all(br#"{"title":"Test"}"#).unwrap();
768768

@@ -802,19 +802,19 @@ mod tests {
802802
bom_manifest.extend_from_slice(manifest_json.as_bytes());
803803

804804
writer
805-
.start_file::<&str, ()>(MANIFEST_PATH, Default::default())
805+
.start_file::<&str, ()>(MANIFEST_PATH, zip::write::FileOptions::default())
806806
.unwrap();
807807
writer.write_all(&bom_manifest).unwrap();
808808

809809
writer
810-
.start_file::<&str, ()>(CONTENT_PATH, Default::default())
810+
.start_file::<&str, ()>(CONTENT_PATH, zip::write::FileOptions::default())
811811
.unwrap();
812812
writer
813813
.write_all(br#"{"version":"0.1","blocks":[]}"#)
814814
.unwrap();
815815

816816
writer
817-
.start_file::<&str, ()>(DUBLIN_CORE_PATH, Default::default())
817+
.start_file::<&str, ()>(DUBLIN_CORE_PATH, zip::write::FileOptions::default())
818818
.unwrap();
819819
writer.write_all(br#"{"title":"Test"}"#).unwrap();
820820

0 commit comments

Comments
 (0)