Skip to content

refactor(cargo): improve lock parse error context and remove dead null-guards #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Strum355 merged 2 commits into from
Aug 31, 2026
Merged

refactor(cargo): improve lock parse error context and remove dead null-guards #622

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
682878a
refactor(cargo): improve lock parse error context and remove dead nul…
a-oren Aug 27, 2026
7c42c0c
test(cargo): remove malformed Cargo.lock parse test
a-oren Aug 31, 2026
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
6 changes: 3 additions & 3 deletions src/providers/rust_cargo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ function parseCargoLockHashes(manifestDir, opts = {}) {
}
}
} catch (error) {
console.warn('Failed to parse Cargo.lock for hashes, SBOM will be generated without hashes')
console.warn(`Failed to parse Cargo.lock at ${lockPath} for hashes: ${error.message}. SBOM will be generated without hashes.`)
}
return hashMap
}
Expand Down Expand Up @@ -470,7 +470,7 @@ function addTransitiveDeps(sbom, metadata, packageId, ignoredDeps, visited, hash
? toPathDepPurl(depPackage.name, depPackage.version)
: toPurl(depPackage.name, depPackage.version)

let hashes = hashMap ? hashMap.get(`${depPackage.name}@${depPackage.version}`) : undefined
let hashes = hashMap.get(`${depPackage.name}@${depPackage.version}`)
sbom.addDependency(sourcePurl, depPurl, undefined, hashes)
addTransitiveDeps(sbom, metadata, depId, ignoredDeps, visited, hashMap)
}
Expand Down Expand Up @@ -501,7 +501,7 @@ function addDirectDeps(sbom, metadata, packageId, parentPurl, ignoredDeps, hashM
? toPathDepPurl(depPackage.name, depPackage.version)
: toPurl(depPackage.name, depPackage.version)

let hashes = hashMap ? hashMap.get(`${depPackage.name}@${depPackage.version}`) : undefined
let hashes = hashMap.get(`${depPackage.name}@${depPackage.version}`)
sbom.addDependency(parentPurl, depPurl, undefined, hashes)
}
}
Expand Down
Loading