This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6766

rustfilepatterns: refactor the pattern of removing a prefix from a &[u8]
ClosedPublic

Authored by valentin.gatienbaron on Aug 26 2019, 8:28 AM.

Details

Reviewers
kevincox
Group Reviewers
hg-reviewers
Commits
rHG62eabdf91f85: rustfilepatterns: refactor the pattern of removing a prefix from a &[u8]

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

kevincox accepted this revision.Aug 28 2019, 5:33 AM
kevincox added inline comments.
rust/hg-core/src/utils.rs
43

I have a small preference for drop_prefix.

43

Put a space in needle: &Self

85

Put a space in needle: &Self

valentin.gatienbaron marked 3 inline comments as done.Aug 28 2019, 7:45 AM
valentin.gatienbaron added a commit: rHG62eabdf91f85: rustfilepatterns: refactor the pattern of removing a prefix from a &[u8].Sep 5 2019, 3:15 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG62eabdf91f85: rustfilepatterns: refactor the pattern of removing a prefix from a &[u8] (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 16383

rust/hg-core/src/filepatterns.rs

let mut group_depth = 0; let mut group_depth = 0;
while let Some((c, rest)) = input.split_first() { while let Some((c, rest)) = input.split_first() {
input = rest; input = rest;
match c { match c {
b'*' => { b'*' => {
for (source, repl) in GLOB_REPLACEMENTS { for (source, repl) in GLOB_REPLACEMENTS {
if input.starts_with(source) { if let Some(rest) = input.drop_prefix(source) {
input = &input[source.len()..]; input = rest;
res.extend(*repl); res.extend(*repl);
break; break;
} }
} }
} }
b'?' => res.extend(b"."), b'?' => res.extend(b"."),
b'[' => { b'[' => {
match input.iter().skip(1).position(|b| *b == b']') { match input.iter().skip(1).position(|b| *b == b']') {
} }
let mut line = line.trim_end(); let mut line = line.trim_end();
if line.is_empty() { if line.is_empty() {
continue; continue;
} }
if line.starts_with(b"syntax:") { if let Some(syntax) = line.drop_prefix(b"syntax:") {
let syntax = line[b"syntax:".len()..].trim(); let syntax = syntax.trim();
if let Some(rel_syntax) = SYNTAXES.get(syntax) { if let Some(rel_syntax) = SYNTAXES.get(syntax) {
current_syntax = rel_syntax; current_syntax = rel_syntax;
} else if warn { } else if warn {
warnings.push((file_path.to_owned(), syntax.to_owned())); warnings.push((file_path.to_owned(), syntax.to_owned()));
} }
continue; continue;
} }
let mut line_syntax: &[u8] = &current_syntax; let mut line_syntax: &[u8] = &current_syntax;
for (s, rels) in SYNTAXES.iter() { for (s, rels) in SYNTAXES.iter() {
if line.starts_with(rels) { if let Some(rest) = line.drop_prefix(rels) {
line_syntax = rels; line_syntax = rels;
line = &line[rels.len()..]; line = rest;
break; break;
} else if line.starts_with(&[s, b":".as_ref()].concat()) { }
if let Some(rest) = line.drop_prefix(&[s, &b":"[..]].concat()) {
line_syntax = rels; line_syntax = rels;
line = &line[s.len() + 1..]; line = rest;
break; break;
} }
} }
inputs.push(( inputs.push((
[line_syntax, line].concat(), [line_syntax, line].concat(),
line_number, line_number,
line.to_owned(), line.to_owned(),

rust/hg-core/src/utils.rs

} }
} }
} }
pub trait SliceExt { pub trait SliceExt {
fn trim_end(&self) -> &Self; fn trim_end(&self) -> &Self;
fn trim_start(&self) -> &Self; fn trim_start(&self) -> &Self;
fn trim(&self) -> &Self; fn trim(&self) -> &Self;
fn drop_prefix(&self, needle: &Self) -> Option<&Self>;
kevincoxUnsubmitted
Done

I have a small preference for drop_prefix.

kevincox: I have a small preference for `drop_prefix`.
kevincoxUnsubmitted
Done

Put a space in needle: &Self

kevincox: Put a space in `needle: &Self`
} }
fn is_not_whitespace(c: &u8) -> bool { fn is_not_whitespace(c: &u8) -> bool {
!(*c as char).is_whitespace() !(*c as char).is_whitespace()
} }
impl SliceExt for [u8] { impl SliceExt for [u8] {
fn trim_end(&self) -> &[u8] { fn trim_end(&self) -> &[u8] {
/// assert_eq!( /// assert_eq!(
/// b" to trim".trim(), /// b" to trim".trim(),
/// b"to trim" /// b"to trim"
/// ); /// );
/// ``` /// ```
fn trim(&self) -> &[u8] { fn trim(&self) -> &[u8] {
self.trim_start().trim_end() self.trim_start().trim_end()
} }
fn drop_prefix(&self, needle: &Self) -> Option<&Self> {
kevincoxUnsubmitted
Done

Put a space in needle: &Self

kevincox: Put a space in needle: &Self
if self.starts_with(needle) {
Some(&self[needle.len()..])
} else {
None
}
}
} }