Skip to content

fix(proguard): Drop redundant line info validation for mapping files#3192

Merged
romtsn merged 7 commits intomasterfrom
rz/fix/drop-proguard-line-info-check
Mar 9, 2026
Merged

fix(proguard): Drop redundant line info validation for mapping files#3192
romtsn merged 7 commits intomasterfrom
rz/fix/drop-proguard-line-info-check

Conversation

@romtsn
Copy link
Member

@romtsn romtsn commented Mar 9, 2026

Summary

  • Remove the has_line_info() check that rejected proguard mapping files without line information — our proguard mapper can handle these files fine
  • Remove ProguardMappingError enum and convert TryFrom<ByteView> to From<ByteView>
  • Update DifFile::is_usable() to always return true for proguard mappings, consistent with the change

Test plan

  • All 170 integration tests pass
  • Clippy clean
  • Removed obsolete proguard-uuid-invalid-mapping.trycmd test
  • Updated proguard-upload-no-upload and upload_proguard-no-upload test snapshots

🤖 Generated with Claude Code

The proguard mapper can remap and support files without line information,
so the has_line_info() check was unnecessarily rejecting valid mappings.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@romtsn romtsn requested review from a team and szokeasaurusrex as code owners March 9, 2026 08:33
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Copy link

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

@romtsn romtsn force-pushed the rz/fix/drop-proguard-line-info-check branch from 78b4dd3 to 8248ef7 Compare March 9, 2026 09:04
Since is_usable() now always returns true for Proguard mappings,
the Proguard arm in get_problem() is dead code.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@romtsn romtsn force-pushed the rz/fix/drop-proguard-line-info-check branch from 8248ef7 to af19d68 Compare March 9, 2026 09:05
Copy link
Member

@szokeasaurusrex szokeasaurusrex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some comments; most important thing is about the tests

romtsn and others added 2 commits March 9, 2026 16:10
- Use exhaustive match instead of wildcard in is_usable() and
  get_problem() to catch future DifFile variants at compile time
- Add test verifying UUID generation succeeds for mappings without
  line info

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
romtsn and others added 2 commits March 9, 2026 16:29
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@romtsn romtsn enabled auto-merge (squash) March 9, 2026 15:31
@romtsn romtsn merged commit a0e91bf into master Mar 9, 2026
25 checks passed
@romtsn romtsn deleted the rz/fix/drop-proguard-line-info-check branch March 9, 2026 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants