Skip to content
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

source_by_zip_path does not need to return an Option #828

Merged
merged 1 commit into from
Jan 31, 2024
Merged

source_by_zip_path does not need to return an Option #828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions symbolic-debuginfo/src/sourcebundle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ impl<'data> SourceBundleDebugSession<'data> {
}

/// Get source by the path of a file in the bundle.
fn source_by_zip_path(&self, zip_path: &str) -> Result<Option<String>, SourceBundleError> {
fn source_by_zip_path(&self, zip_path: &str) -> Result<String, SourceBundleError> {
let mut archive = self.archive.lock();
let mut file = archive
.by_name(zip_path)
Expand All @@ -903,7 +903,7 @@ impl<'data> SourceBundleDebugSession<'data> {

file.read_to_string(&mut source_content)
.map_err(|e| SourceBundleError::new(SourceBundleErrorKind::BadZip, e))?;
Ok(Some(source_content))
Ok(source_content)
}

/// Looks up a source file descriptor.
Expand All @@ -916,14 +916,16 @@ impl<'data> SourceBundleDebugSession<'data> {
) -> Result<Option<SourceFileDescriptor<'_>>, SourceBundleError> {
if let Some(zip_path) = self.index.indexed_files.get(&key) {
let zip_path = zip_path.as_str();
let content = self.source_by_zip_path(zip_path)?;
let content = Cow::Owned(self.source_by_zip_path(zip_path)?);
let info = self.index.manifest.files.get(zip_path);
return Ok(content.map(|opt| SourceFileDescriptor::new_embedded(Cow::Owned(opt), info)));
let descriptor = SourceFileDescriptor::new_embedded(content, info);
return Ok(Some(descriptor));
}

let FileKey::Path(path) = key else {
return Ok(None);
};

Ok(self
.source_links
.resolve(&path)
Expand Down
Loading