Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-18 00:53:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

inline some code

Browse source 
Signed-off-by: Hanif Bin Ariffin <hanif.ariffin.4326@gmail.com>
This commit is contained in:
Hanif Bin Ariffin 2021-07-26 14:03:47 +08:00
parent 5657f5af3a
commit 3fea69f9ed
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/uu/tr/src/operation.rs
View file

@ -47,18 +47,6 @@ pub enum Sequence {
} }
impl Sequence { impl Sequence {
// TODO: Can we do better?
pub fn convert_octal_to_char(input: &str) -> char {
if input.starts_with("\\") && input.len() > 1 {
u32::from_str_radix(&input[1..], 8)
.map(|u| char::from_u32(u))
.unwrap()
.unwrap()
} else {
input.chars().next().unwrap()
}
}
pub fn flatten(&self) -> Box<dyn Iterator<Item = char>> { pub fn flatten(&self) -> Box<dyn Iterator<Item = char>> {
match self { match self {
Sequence::Char(c) => Box::new(std::iter::once(*c)), Sequence::Char(c) => Box::new(std::iter::once(*c)),
@ -243,7 +231,16 @@ impl Sequence {
preceded(tag("\\"), recognize(many_m_n(1, 3, one_of("01234567")))), preceded(tag("\\"), recognize(many_m_n(1, 3, one_of("01234567")))),
recognize(anychar), recognize(anychar),
)))(input) )))(input)
.map(|(l, a)| (l, Sequence::convert_octal_to_char(a))) .map(|(l, a)| {
(
l,
if let Some(input) = a.strip_prefix('\\') {
char::from_u32(u32::from_str_radix(&input, 8).unwrap()).unwrap()
} else {
input.chars().next().unwrap()
},
)
})
} }
fn parse_char(input: &str) -> IResult<&str, Sequence> { fn parse_char(input: &str) -> IResult<&str, Sequence> {