Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
run: cargo fmt --all -- --check

- name: Clippy
run: cargo clippy --workspace --all-features -- -D warnings
run: cargo clippy --workspace --all-targets --all-features -- -D warnings

docs:
name: Documentation
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
run: cargo test --manifest-path cdx-swift-bridge/Cargo.toml

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

security:
name: Security Audit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: cargo test --workspace --all-features

- name: Clippy
run: cargo clippy --workspace --all-features -- -D warnings
run: cargo clippy --workspace --all-targets --all-features -- -D warnings

- name: Build docs
run: cargo doc --workspace --no-deps --all-features
Expand Down
26 changes: 13 additions & 13 deletions cdx-core/src/archive/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -475,11 +475,11 @@ mod tests {
let buffer = Cursor::new(Vec::new());
let mut writer = zip::ZipWriter::new(buffer);
writer
.start_file::<&str, ()>(CONTENT_PATH, Default::default())
.start_file::<&str, ()>(CONTENT_PATH, zip::write::FileOptions::default())
.unwrap();
writer.write_all(b"{}").unwrap();
writer
.start_file::<&str, ()>(DUBLIN_CORE_PATH, Default::default())
.start_file::<&str, ()>(DUBLIN_CORE_PATH, zip::write::FileOptions::default())
.unwrap();
writer.write_all(b"{}").unwrap();
let data = writer.finish().unwrap().into_inner();
Expand All @@ -496,13 +496,13 @@ mod tests {

// Add manifest
writer
.start_file::<&str, ()>(MANIFEST_PATH, Default::default())
.start_file::<&str, ()>(MANIFEST_PATH, zip::write::FileOptions::default())
.unwrap();
writer.write_all(br#"{"cdx":"0.1"}"#).unwrap();

// Add Dublin Core but no content
writer
.start_file::<&str, ()>(DUBLIN_CORE_PATH, Default::default())
.start_file::<&str, ()>(DUBLIN_CORE_PATH, zip::write::FileOptions::default())
.unwrap();
writer.write_all(b"{}").unwrap();

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

writer
.start_file::<&str, ()>(MANIFEST_PATH, Default::default())
.start_file::<&str, ()>(MANIFEST_PATH, zip::write::FileOptions::default())
.unwrap();
writer.write_all(b"{ invalid json }").unwrap();

writer
.start_file::<&str, ()>(CONTENT_PATH, Default::default())
.start_file::<&str, ()>(CONTENT_PATH, zip::write::FileOptions::default())
.unwrap();
writer.write_all(b"{}").unwrap();

writer
.start_file::<&str, ()>(DUBLIN_CORE_PATH, Default::default())
.start_file::<&str, ()>(DUBLIN_CORE_PATH, zip::write::FileOptions::default())
.unwrap();
writer.write_all(b"{}").unwrap();

Expand Down Expand Up @@ -740,7 +740,7 @@ mod tests {

// Write content BEFORE manifest
writer
.start_file::<&str, ()>(CONTENT_PATH, Default::default())
.start_file::<&str, ()>(CONTENT_PATH, zip::write::FileOptions::default())
.unwrap();
writer
.write_all(br#"{"version":"0.1","blocks":[]}"#)
Expand All @@ -757,12 +757,12 @@ mod tests {
"metadata": { "dublinCore": "metadata/dublin-core.json" }
}"#;
writer
.start_file::<&str, ()>(MANIFEST_PATH, Default::default())
.start_file::<&str, ()>(MANIFEST_PATH, zip::write::FileOptions::default())
.unwrap();
writer.write_all(manifest_json.as_bytes()).unwrap();

writer
.start_file::<&str, ()>(DUBLIN_CORE_PATH, Default::default())
.start_file::<&str, ()>(DUBLIN_CORE_PATH, zip::write::FileOptions::default())
.unwrap();
writer.write_all(br#"{"title":"Test"}"#).unwrap();

Expand Down Expand Up @@ -802,19 +802,19 @@ mod tests {
bom_manifest.extend_from_slice(manifest_json.as_bytes());

writer
.start_file::<&str, ()>(MANIFEST_PATH, Default::default())
.start_file::<&str, ()>(MANIFEST_PATH, zip::write::FileOptions::default())
.unwrap();
writer.write_all(&bom_manifest).unwrap();

writer
.start_file::<&str, ()>(CONTENT_PATH, Default::default())
.start_file::<&str, ()>(CONTENT_PATH, zip::write::FileOptions::default())
.unwrap();
writer
.write_all(br#"{"version":"0.1","blocks":[]}"#)
.unwrap();

writer
.start_file::<&str, ()>(DUBLIN_CORE_PATH, Default::default())
.start_file::<&str, ()>(DUBLIN_CORE_PATH, zip::write::FileOptions::default())
.unwrap();
writer.write_all(br#"{"title":"Test"}"#).unwrap();

Expand Down
Loading
Loading