Address PR review feedback

- Revert cache version bump (4 stays, struct layout unchanged)
- Make LineMapping.startline/endline Optional, remove has_minified_range
- Extract startline/endline variables in cache find_members_and_rules

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: romtsn

src/builder.rs

@@ -292,8 +292,8 @@ impl<'s> ParsedProguardMapping<'s> {
                         None
                     };
                     let (mut startline, mut endline) = match line_mapping.as_ref() {
-                        Some(lm) if lm.has_minified_range => (Some(lm.startline), Some(lm.endline)),
-                        _ => (None, None),
+                        Some(lm) => (lm.startline, lm.endline),
+                        None => (None, None),
                     };
                     let (mut original_startline, mut original_endline) = match line_mapping {
                         None => (None, None),

src/cache/mod.rs

@@ -390,10 +390,9 @@ impl<'data> ProguardCache<'data> {
             for member in mapping_entries {
                 // Check if this member would produce a frame (line matching)
                 let pf_line = prepared_frame.line.unwrap_or(0);
-                if member.endline().unwrap_or(0) == 0
-                    || (pf_line >= member.startline().unwrap_or(0) as usize
-                        && pf_line <= member.endline().unwrap_or(0) as usize)
-                {
+                let startline = member.startline().unwrap_or(0) as usize;
+                let endline = member.endline().unwrap_or(0) as usize;
+                if endline == 0 || (pf_line >= startline && pf_line <= endline) {
                     had_mappings = true;
                     rewrite_rules.extend(self.decode_rewrite_rules(member));
                 }

src/cache/raw.rs

@@ -19,7 +19,7 @@ pub(crate) const PRGCACHE_MAGIC: u32 = u32::from_le_bytes(PRGCACHE_MAGIC_BYTES);
 pub(crate) const PRGCACHE_MAGIC_FLIPPED: u32 = PRGCACHE_MAGIC.swap_bytes();
 
 /// The current version of the ProguardCache format.
-pub const PRGCACHE_VERSION: u32 = 5;
+pub const PRGCACHE_VERSION: u32 = 4;
 
 /// The header of a proguard cache file.
 #[derive(Debug, Clone, PartialEq, Eq)]

src/mapping.rs

@@ -287,17 +287,14 @@ impl<'s> Iterator for ProguardRecordIter<'s> {
 /// All line mappings are 1-based and inclusive.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct LineMapping {
-    /// Start Line, 1-based.
-    pub startline: usize,
-    /// End Line, inclusive.
-    pub endline: usize,
+    /// Start Line, 1-based. `None` when no minified range prefix was present.
+    pub startline: Option<usize>,
+    /// End Line, inclusive. `None` when no minified range prefix was present.
+    pub endline: Option<usize>,
     /// The original Start Line.
     pub original_startline: Option<usize>,
     /// The original End Line.
     pub original_endline: Option<usize>,
-    /// Whether this mapping had an explicit minified line range prefix (e.g. `0:0:` or `1:5:`).
-    /// `false` when the mapping line had no range prefix (e.g. `void method():42 -> a`).
-    pub has_minified_range: bool,
 }
 
 /// An R8 header, as described in
@@ -471,11 +468,10 @@ impl<'s> ProguardRecord<'s> {
     ///         arguments: "",
     ///         original_class: Some("com.example1.domain.MyBean"),
     ///         line_mapping: Some(proguard::LineMapping {
-    ///             startline: 1016,
-    ///             endline: 1016,
+    ///             startline: Some(1016),
+    ///             endline: Some(1016),
     ///             original_startline: Some(16),
     ///             original_endline: Some(16),
-    ///             has_minified_range: true,
     ///         }),
     ///     })
     /// );
@@ -641,20 +637,18 @@ fn parse_proguard_field_or_method(
 
             let line_mapping = match (startline, endline, original_startline) {
                 (Some(startline), Some(endline), _) => Some(LineMapping {
-                    startline,
-                    endline,
+                    startline: Some(startline),
+                    endline: Some(endline),
                     original_startline,
                     original_endline,
-                    has_minified_range: true,
                 }),
                 // Preserve original line info even when no minified range is present.
                 // This enables this crate to use the original line for no-line mappings.
                 (None, None, Some(original_startline)) => Some(LineMapping {
-                    startline: 0,
-                    endline: 0,
+                    startline: None,
+                    endline: None,
                     original_startline: Some(original_startline),
                     original_endline,
-                    has_minified_range: false,
                 }),
                 _ => None,
             };
@@ -987,11 +981,10 @@ mod tests {
                 arguments: "androidx.appcompat.widget.Toolbar",
                 original_class: Some("androidx.appcompat.app.AppCompatDelegateImpl"),
                 line_mapping: Some(LineMapping {
-                    startline: 14,
-                    endline: 15,
+                    startline: Some(14),
+                    endline: Some(15),
                     original_startline: None,
                     original_endline: None,
-                    has_minified_range: true,
                 }),
             }),
         );
@@ -1010,11 +1003,10 @@ mod tests {
                 arguments: "androidx.appcompat.widget.Toolbar",
                 original_class: Some("androidx.appcompat.app.AppCompatDelegateImpl"),
                 line_mapping: Some(LineMapping {
-                    startline: 14,
-                    endline: 15,
+                    startline: Some(14),
+                    endline: Some(15),
                     original_startline: Some(436),
                     original_endline: None,
-                    has_minified_range: true,
                 }),
             }),
         );
@@ -1033,11 +1025,10 @@ mod tests {
                 arguments: "androidx.appcompat.widget.Toolbar",
                 original_class: Some("androidx.appcompat.app.AppCompatDelegateImpl"),
                 line_mapping: Some(LineMapping {
-                    startline: 14,
-                    endline: 15,
+                    startline: Some(14),
+                    endline: Some(15),
                     original_startline: Some(436),
                     original_endline: Some(437),
-                    has_minified_range: true,
                 }),
             }),
         );
@@ -1170,11 +1161,10 @@ androidx.activity.OnBackPressedCallback
                     arguments: "",
                     original_class: None,
                     line_mapping: Some(LineMapping {
-                        startline: 1,
-                        endline: 4,
+                        startline: Some(1),
+                        endline: Some(4),
                         original_startline: Some(184),
                         original_endline: Some(187),
-                        has_minified_range: true,
                     }),
                 }),
                 Ok(ProguardRecord::R8Header(R8Header::Synthesized)),