Skip to content
Snippets Groups Projects
Commit 29cf3167e459 authored by Raphaël Gomès's avatar Raphaël Gomès
Browse files

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

parent c7fb9b74e753
No related branches found
No related tags found
2 merge requests!485branching: merge default into stable,!303rust: upgrade supported Rust toolchain version and cascade upgrades
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
use crate::errors::HgError; use crate::errors::HgError;
use crate::errors::HgResultExt; use crate::errors::HgResultExt;
use crate::utils::StrExt;
use crate::vfs::Vfs; use crate::vfs::Vfs;
use std::io; use std::io;
use std::io::ErrorKind; use std::io::ErrorKind;
...@@ -107,7 +106,7 @@ ...@@ -107,7 +106,7 @@
/// running anymore. /// running anymore.
fn lock_should_be_broken(data: &Option<String>) -> bool { fn lock_should_be_broken(data: &Option<String>) -> bool {
(|| -> Option<bool> { (|| -> Option<bool> {
let (prefix, pid) = data.as_ref()?.split_2(':')?; let (prefix, pid) = data.as_ref()?.split_once(':')?;
if prefix != &*LOCK_PREFIX { if prefix != &*LOCK_PREFIX {
return Some(false); return Some(false);
} }
......
...@@ -145,21 +145,6 @@ ...@@ -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 { pub trait Escaped {
/// Return bytes escaped for display to the user /// Return bytes escaped for display to the user
fn escaped_bytes(&self) -> Vec<u8>; fn escaped_bytes(&self) -> Vec<u8>;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment