changeset 49632:29cf3167e459

hg-core: remove unneeded trait now that we support Rust 1.52+

--- a/rust/hg-core/src/lock.rs	Mon Nov 14 15:20:48 2022 +0100
+++ b/rust/hg-core/src/lock.rs	Mon Nov 14 15:29:58 2022 +0100
@@ -2,7 +2,6 @@
 
 use crate::errors::HgError;
 use crate::errors::HgResultExt;
-use crate::utils::StrExt;
 use crate::vfs::Vfs;
 use std::io;
 use std::io::ErrorKind;
@@ -107,7 +106,7 @@
 /// running anymore.
 fn lock_should_be_broken(data: &Option<String>) -> bool {
     (|| -> Option<bool> {
-        let (prefix, pid) = data.as_ref()?.split_2(':')?;
+        let (prefix, pid) = data.as_ref()?.split_once(':')?;
         if prefix != &*LOCK_PREFIX {
             return Some(false);
         }

--- a/rust/hg-core/src/utils.rs	Mon Nov 14 15:20:48 2022 +0100
+++ b/rust/hg-core/src/utils.rs	Mon Nov 14 15:29:58 2022 +0100
@@ -145,21 +145,6 @@
     }
 }
 
-pub trait StrExt {
-    // TODO: Use https://doc.rust-lang.org/nightly/std/primitive.str.html#method.split_once
-    // once we require Rust 1.52+
-    fn split_2(&self, separator: char) -> Option<(&str, &str)>;
-}
-
-impl StrExt for str {
-    fn split_2(&self, separator: char) -> Option<(&str, &str)> {
-        let mut iter = self.splitn(2, separator);
-        let a = iter.next()?;
-        let b = iter.next()?;
-        Some((a, b))
-    }
-}
-
 pub trait Escaped {
     /// Return bytes escaped for display to the user
     fn escaped_bytes(&self) -> Vec<u8>;