Merge pull request #533 from workingjubilee/use-std-fn-from-1.55

rust-lang · Jun 22, 2023 · 3a61258 · 3a61258
2 parents 6f3ab0b + 9668103
commit 3a61258
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
diff --git a/src/symbolize/gimli/parse_running_mmaps_unix.rs b/src/symbolize/gimli/parse_running_mmaps_unix.rs
@@ -97,15 +97,10 @@ impl FromStr for MapsEntry {
         let pathname_str = parts.next().unwrap_or(""); // pathname may be omitted.
 
         let hex = |s| usize::from_str_radix(s, 16).map_err(|_| "Couldn't parse hex number");
-        let address = {
-            // This could use `range_str.split_once('-')` once the MSRV passes 1.52.
-            if let Some(idx) = range_str.find('-') {
-                let (start, rest) = range_str.split_at(idx);
-                let (_div, limit) = rest.split_at(1);
-                (hex(start)?, hex(limit)?)
-            } else {
-                return Err("Couldn't parse address range");
-            }
+        let address = if let Some((start, limit)) = range_str.split_once('-') {
+            (hex(start)?, hex(limit)?)
+        } else {
+            return Err("Couldn't parse address range");
         };
         let perms: [char; 4] = {
             let mut chars = perms_str.chars();
@@ -117,15 +112,10 @@ impl FromStr for MapsEntry {
             perms
         };
         let offset = hex(offset_str)?;
-        let dev = {
-            // This could use `dev_str.split_once(':')` once the MSRV passes 1.52.
-            if let Some(idx) = dev_str.find(':') {
-                let (major, rest) = dev_str.split_at(idx);
-                let (_div, minor) = rest.split_at(1);
-                (hex(major)?, hex(minor)?)
-            } else {
-                return Err("Couldn't parse dev")?;
-            }
+        let dev = if let Some((major, minor)) = dev_str.split_once(':') {
+            (hex(major)?, hex(minor)?)
+        } else {
+            return Err("Couldn't parse dev");
         };
         let inode = hex(inode_str)?;
         let pathname = pathname_str.into();

diff --git a/tests/current-exe-mismatch.rs b/tests/current-exe-mismatch.rs
@@ -118,11 +118,8 @@ fn find_interpreter(me: &Path) -> Result<PathBuf, EarlyExit> {
             let line = line?;
             let line = line.trim();
             let prefix = "[Requesting program interpreter: ";
-            // This could use `line.split_once` and `suffix.rsplit_once` once the MSRV passes 1.52
-            if let Some(idx) = line.find(prefix) {
-                let (_, suffix) = line.split_at(idx + prefix.len());
-                if let Some(idx) = suffix.rfind("]") {
-                    let (found_path, _ignore_remainder) = suffix.split_at(idx);
+            if let Some((_, suffix)) = line.split_once(prefix) {
+                if let Some((found_path, _)) = suffix.rsplit_once("]") {
                     return Ok(found_path.into());
                 }
             }