Skip to content

Use str::strip_prefix instead of custom rm_prefix function #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use str::strip_prefix instead of custom rm_prefix function #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions src/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use crate::Encoding;

const QUALIFIERS: &'static [char] = &[
const QUALIFIERS: &[char] = &[
'r', // const
'n', // in
'N', // inout
Expand Down Expand Up @@ -36,43 +36,43 @@ fn rm_enc_prefix<'a>(s: &'a str, enc: &Encoding) -> Option<&'a str> {
Sel => ":",
Unknown => "?",
BitField(b) => {
let s = rm_prefix(s, "b")?;
let s = s.strip_prefix("b")?;
return rm_int_prefix(s, b);
}
Pointer(t) => {
let s = rm_prefix(s, "^")?;
let s = s.strip_prefix("^")?;
return rm_enc_prefix(s, t);
}
Array(len, item) => {
let mut s = s;
s = rm_prefix(s, "[")?;
s = s.strip_prefix("[")?;
s = rm_int_prefix(s, len)?;
s = rm_enc_prefix(s, item)?;
return rm_prefix(s, "]");
return s.strip_prefix("]");
}
Struct(name, fields) => {
let mut s = s;
s = rm_prefix(s, "{")?;
s = rm_prefix(s, name)?;
s = rm_prefix(s, "=")?;
s = s.strip_prefix("{")?;
s = s.strip_prefix(name)?;
s = s.strip_prefix("=")?;
for field in fields {
s = rm_enc_prefix(s, field)?;
}
return rm_prefix(s, "}");
return s.strip_prefix("}");
}
Union(name, members) => {
let mut s = s;
s = rm_prefix(s, "(")?;
s = rm_prefix(s, name)?;
s = rm_prefix(s, "=")?;
s = s.strip_prefix("(")?;
s = s.strip_prefix(name)?;
s = s.strip_prefix("=")?;
for member in members {
s = rm_enc_prefix(s, member)?;
}
return rm_prefix(s, ")");
return s.strip_prefix(")");
}
};

rm_prefix(s, code)
s.strip_prefix(code)
}

fn chomp_int(s: &str) -> Option<(u32, &str)> {
Expand All @@ -89,14 +89,6 @@ fn rm_int_prefix(s: &str, other: u32) -> Option<&str> {
.and_then(|(n, t)| if other == n { Some(t) } else { None })
}

fn rm_prefix<'a>(s: &'a str, other: &str) -> Option<&'a str> {
if s.starts_with(other) {
Some(&s[other.len()..])
} else {
None
}
}

pub fn eq_enc(s: &str, enc: &Encoding) -> bool {
// strip qualifiers
let s = s.trim_start_matches(QUALIFIERS);
Expand Down